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.246 by root, Sun May 28 00:40:51 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 utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
10	use CFClient::Texture;	12	use CFPlus::Texture;
11		13
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		15
14	our $LAYOUT;	16	our $LAYOUT;
15	our $ROOT;	17	our $ROOT;
16	our $TOOLTIP;	18	our $TOOLTIP;
17	our $BUTTON_STATE;	19	our $BUTTON_STATE;
18		20
19	our %WIDGET; # all widgets, weak-referenced	21	our %WIDGET; # all widgets, weak-referenced
20		22
21	sub get_layout {	23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};
29	}
30
31	return $LAYOUT;
32	}
33
34	sub set_layout {
35	my ($layout) = @_;
36	$LAYOUT = $layout;
37	}
38
39	sub check_tooltip {
40	if (!$GRAB) {	24	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->hide;
		29
45	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31
		32	return if $ENV{CFPLUS_DEBUG} & 8;
46		33
47	my $tip = $widget->{tooltip};	34	my $tip = $widget->{tooltip};
48		35
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	36	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		37
51	$TOOLTIP->set_tooltip_from ($widget);	38	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	39	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	40	}
63		41
64	return;	42	return;
65	}	43	}
66	}	44	}
67	}	45	}
68		46
69	$TOOLTIP->hide;	47	$TOOLTIP->hide;
70	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;
71	}	72	}
72		73
73	# class methods for events	74	# class methods for events
74	sub feed_sdl_key_down_event {	75	sub feed_sdl_key_down_event {
75	$FOCUS->emit (key_down => $_[0])	76	$FOCUS->emit (key_down => $_[0])
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
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	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	check_tooltip;	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	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	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
119	check_tooltip;	140	check_hover $widget;
		141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	check_tooltip;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
172	sub rescale_widgets {	187	sub rescale_widgets {
173	my ($sx, $sy) = @_;	188	my ($sx, $sy) = @_;
174		189
175	for my $widget (values %WIDGET) {	190	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	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
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	195	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	196	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	197	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	198	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	199	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_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
183	}	205	}
184	}	206	}
185		207
186	reconfigure_widgets;	208	reconfigure_widgets;
187	}	209	}
188		210
189	#############################################################################	211	#############################################################################
190		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
191	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
192		222
193	use strict;	223	use strict;
194		224
195	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
196		226
197	sub new {	227	sub new {
198	my $class = shift;	228	my $class = shift;
199		229
200	my $self = bless {	230	my $self = bless {
201	x => 0,	231	x => "center",
202	y => 0,	232	y => "center",
203	z => 0,	233	z => 0,
		234	w => undef,
		235	h => undef,
204	can_events => 1,	236	can_events => 1,
205	@_	237	@_
206	}, $class;	238	}, $class;
		239
		240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
207		241
208	for (keys %$self) {	242	for (keys %$self) {
209	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
210	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
211	}	245	}
212	}	246	}
213		247
214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
217	$self->{req_x} = $layout->{x} * $::WIDTH;	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
218	$self->{req_y} = $layout->{y} * $::HEIGHT;	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	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};
221	}	258	}
222		259
223	$self	260	$self
224	}
225
226	sub toggle_visibility {
227	my ($self) = @_;
228
229	if ($self->{visible}) {
230	$self->hide;
231	} else {
232	$self->show;
233	}
234	}	261	}
235		262
236	sub destroy {	263	sub destroy {
237	my ($self) = @_;	264	my ($self) = @_;
238		265
…		…
240	%$self = ();	267	%$self = ();
241	}	268	}
242		269
243	sub show {	270	sub show {
244	my ($self) = @_;	271	my ($self) = @_;
		272
245	return if $self->{parent};	273	return if $self->{parent};
246		274
247	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
248	}
249
250	sub show_centered {
251	my ($self) = @_;
252	return if $self->{parent};
253
254	$self->show;
255
256	$CFClient::UI::ROOT->on_post_alloc (
257	"centered $self" => sub {
258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259	},
260	);
261	}	276	}
262		277
263	sub set_visible {	278	sub set_visible {
264	my ($self) = @_;	279	my ($self) = @_;
265		280
266	return if $self->{visible};	281	return if $self->{visible};
267		282
268	$self->{root} = $self->{parent}{root};	283	$self->{root} = $self->{parent}{root};
269	$self->{visible} = $self->{parent}{visible} + 1;	284	$self->{visible} = $self->{parent}{visible} + 1;
270		285
271	$self->emit (visibility_change => 1)	286	$self->emit (visibility_change => 1);
		287
		288	$self->realloc if !exists $self->{req_w};
		289
		290	$_->set_visible for $self->children;
272	}	291	}
273		292
274	sub set_invisible {	293	sub set_invisible {
275	my ($self) = @_;	294	my ($self) = @_;
276		295
277	return unless $self->{visible};	296	return unless $self->{visible};
278		297
279	# broken show/hide model	298	$_->set_invisible for $self->children;
280		299
		300	delete $self->{visible};
281	delete $self->{root};	301	delete $self->{root};
282	delete $self->{visible};
283		302
284	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
285	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
286		305
287	CFClient::UI::check_tooltip	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
288	if $CFClient::UI::TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
289		308
290	$self->focus_out;	309	$self->emit ("focus_out");
291
292	$self->emit (visibility_change => 0);	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;
293	}	328	}
294		329
295	sub hide {	330	sub hide {
296	my ($self) = @_;	331	my ($self) = @_;
297		332
…		…
299		334
300	$self->{parent}->remove ($self)	335	$self->{parent}->remove ($self)
301	if $self->{parent};	336	if $self->{parent};
302	}	337	}
303		338
304	sub move {	339	sub move_abs {
305	my ($self, $x, $y, $z) = @_;	340	my ($self, $x, $y, $z) = @_;
306		341
307	$self->{x} = int $x;	342	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
308	$self->{y} = int $y;	343	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
309	$self->{z} = $z if defined $z;	344	$self->{z} = $z if defined $z;
310		345
311	$self->update;	346	$self->update;
312	}	347	}
313		348
314	sub set_size {	349	sub set_size {
315	my ($self, $w, $h) = @_;	350	my ($self, $w, $h) = @_;
316		351
317	$self->{def_w} = $w;	352	$self->{force_w} = $w;
318	$self->{def_h} = $h;	353	$self->{force_h} = $h;
319		354
320	$self->check_size;	355	$self->realloc;
321	}	356	}
322		357
323	sub size_request {	358	sub size_request {
324	require Carp;	359	require Carp;
325	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
326	}	361	}
327		362
		363	sub baseline_shift {
		364	0
		365	}
		366
328	sub configure {	367	sub configure {
329	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
330		369
331	if ($self->{aspect}) {	370	if ($self->{aspect}) {
		371	my ($ow, $oh) = ($w, $h);
		372
332	my $w2 = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
333	my $h2 = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
334		375
335	# use alignment to adjust x, y	376	# use alignment to adjust x, y
336		377
337	$x += int +($w - $w2) * 0.5;	378	$x += int 0.5 * ($ow - $w);
338	$y += int +($h - $h2) * 0.5;	379	$y += int 0.5 * ($oh - $h);
339
340	($w, $h) = ($w2, $h2);
341	}	380	}
342		381
343	if ($self->{x} != $x || $self->{y} != $y) {	382	if ($self->{x} ne $x || $self->{y} ne $y) {
344	$self->{x} = $x;	383	$self->{x} = $x;
345	$self->{y} = $y;	384	$self->{y} = $y;
346	$self->update;	385	$self->update;
347	}	386	}
348		387
349	if ($self->{w} != $w || $self->{h} != $h) {	388	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	389	return unless $self->{visible};
351	}
352	}
353		390
354	sub size_allocate {	391	$self->{alloc_w} = $w;
355	# nothing to be done	392	$self->{alloc_h} = $h;
356	}
357		393
358	sub reconfigure {	394	$self->{root}{size_alloc}{$self+0} = $self;
359	my ($self) = @_;	395	}
360
361	$self->check_size (1);
362	$self->update;
363	}	396	}
364		397
365	sub children {	398	sub children {
		399	# nop
		400	}
		401
		402	sub visible_children {
		403	$_[0]->children
366	}	404	}
367		405
368	sub set_max_size {	406	sub set_max_size {
369	my ($self, $w, $h) = @_;	407	my ($self, $w, $h) = @_;
370		408
371	delete $self->{max_w}; $self->{max_w} = $w if $w;	409	$self->{max_w} = int $w if defined $w;
372	delete $self->{max_h}; $self->{max_h} = $h if $h;	410	$self->{max_h} = int $h if defined $h;
		411
		412	$self->realloc;
373	}	413	}
374		414
375	sub set_tooltip {	415	sub set_tooltip {
376	my ($self, $tooltip) = @_;	416	my ($self, $tooltip) = @_;
377		417
…		…
380		420
381	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
382		422
383	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
384		424
385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
386	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
387	CFClient::UI::check_tooltip;	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
388	}	428	}
389	}	429	}
390		430
391	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
392	sub coord2local {	432	sub coord2local {
393	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
394		434
		435	Carp::confess unless $self->{parent};#d#
		436
395	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
396	}	438	}
397		439
398	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
399	sub coord2global {	441	sub coord2global {
400	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
401		443
		444	Carp::confess unless $self->{parent};#d#
		445
402	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
403	}	447	}
404		448
405	sub focus_in {	449	sub invoke_focus_in {
406	my ($self) = @_;	450	my ($self) = @_;
407		451
408	return if $FOCUS == $self;	452	return if $FOCUS == $self;
409	return unless $self->{can_focus};	453	return unless $self->{can_focus};
410		454
411	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
412		456
413	$self->_emit (focus_in => $focus);	457	$self->update;
414		458
415	$focus->update if $focus;	459	0
416	$FOCUS->update;
417	}	460	}
418		461
419	sub focus_out {	462	sub invoke_focus_out {
420	my ($self) = @_;	463	my ($self) = @_;
421		464
422	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
423		466
424	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
425		468
426	$self->_emit (focus_out => $focus);	469	$self->update;
427		470
428	$focus->update if $focus; #?
429
430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
431	unless $FOCUS;	472	unless $FOCUS;
432	}
433		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
434	sub mouse_motion { }	484	sub invoke_mouse_motion { 0 }
435	sub button_up { }	485	sub invoke_button_up { 0 }
436	sub key_down { }	486	sub invoke_key_down { 0 }
437	sub key_up { }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
438		489
439	sub button_down {	490	sub invoke_button_down {
440	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
441		492
442	$self->focus_in;	493	$self->grab_focus;
443	}
444		494
445	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	495	0
446	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	496	}
447	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	497
448	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	498	sub connect {
449	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
450		584
451	sub draw {	585	sub draw {
452	my ($self) = @_;	586	my ($self) = @_;
453		587
454	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);
455		597
456	glPushMatrix;	598	glPushMatrix;
457	glTranslate $self->{x}, $self->{y}, 0;	599	glTranslate $self->{x}, $self->{y}, 0;
458	$self->_draw;
459	glPopMatrix;
460		600
461	if ($self == $HOVER && $self->{can_hover}) {	601	if ($self == $HOVER && $self->{can_hover}) {
462	my ($x, $y) = @$self{qw(x y)};
463
464	glColor 1, 0.8, 0.5, 0.2;	602	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465	glEnable GL_BLEND;	603	glEnable GL_BLEND;
466	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	604	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467	glBegin GL_QUADS;	605	glBegin GL_QUADS;
468	glVertex $x , $y;	606	glVertex 0 , 0;
469	glVertex $x + $self->{w}, $y;	607	glVertex $self->{w}, 0;
470	glVertex $x + $self->{w}, $y + $self->{h};	608	glVertex $self->{w}, $self->{h};
471	glVertex $x , $y + $self->{h};	609	glVertex 0 , $self->{h};
472	glEnd;	610	glEnd;
473	glDisable GL_BLEND;	611	glDisable GL_BLEND;
474	}	612	}
475		613
476	if ($ENV{PCLIENT_DEBUG}) {	614	if ($ENV{CFPLUS_DEBUG} & 1) {
477	glPushMatrix;	615	glPushMatrix;
478	glColor 1, 1, 0, 1;	616	glColor 1, 1, 0, 1;
479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	617	glTranslate 0.375, 0.375;
480	glBegin GL_LINE_LOOP;	618	glBegin GL_LINE_LOOP;
481	glVertex 0 , 0;	619	glVertex 0 , 0;
482	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
483	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
484	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
485	glEnd;	623	glEnd;
486	glPopMatrix;	624	glPopMatrix;
487	#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;
488	}	626	}
		627
		628	$self->_draw;
		629	glPopMatrix;
489	}	630	}
490		631
491	sub _draw {	632	sub _draw {
492	my ($self) = @_;	633	my ($self) = @_;
493		634
494	warn "no draw defined for $self\n";	635	warn "no draw defined for $self\n";
495	}	636	}
496		637
497	sub find_widget {
498	my ($self, $x, $y) = @_;
499
500	return () unless $self->{can_events};
501
502	return $self
503	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506	()
507	}
508
509	sub set_parent {
510	my ($self, $parent) = @_;
511
512	Scalar::Util::weaken ($self->{parent} = $parent);
513
514	$self->set_visible;
515
516	$self->check_size;
517	$self->show;
518	}
519
520	sub check_size {
521	my ($self, $forced) = @_;
522
523	$self->{force_alloc} = 1 if $forced;
524	$CFClient::UI::ROOT->{check_size}{$self} = $self;
525	}
526
527	sub update {
528	my ($self) = @_;
529
530	$self->{parent}->update
531	if $self->{parent};
532	}
533
534	sub connect {
535	my ($self, $signal, $cb) = @_;
536
537	push @{ $self->{signal_cb}{$signal} }, $cb;
538	}
539
540	sub _emit {
541	my ($self, $signal, @args) = @_;
542
543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544	}
545
546	sub emit {
547	my ($self, $signal, @args) = @_;
548
549	$self->_emit ($signal, @args)
550	|| $self->$signal (@args);
551	}
552
553	sub visibility_change {
554	#my ($self, $visible) = @_;
555	}
556
557	sub DESTROY {	638	sub DESTROY {
558	my ($self) = @_;	639	my ($self) = @_;
559		640
		641	return if CFPlus::in_destruct;
		642
560	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
561	#$self->deactivate;
562	}
563		644
564	#############################################################################	645	eval { $self->destroy };
		646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		647	}
565		648
		649	#############################################################################
		650
566	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
567		652
568	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
569		654
570	use strict;	655	use strict;
571	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
572		657
573	sub new {	658	sub new {
574	my $class = shift;	659	my $class = shift;
575		660
576	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
591		676
592	if ($color && (@$color < 4 || $color->[3])) {	677	if ($color && (@$color < 4 || $color->[3])) {
593	my ($w, $h) = @$self{qw(w h)};	678	my ($w, $h) = @$self{qw(w h)};
594		679
595	glEnable GL_BLEND;	680	glEnable GL_BLEND;
596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	681	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597	glColor @$color;	682	glColor_premultiply @$color;
598		683
599	glBegin GL_QUADS;	684	glBegin GL_QUADS;
600	glVertex 0 , 0;	685	glVertex 0 , 0;
601	glVertex 0 , $h;	686	glVertex 0 , $h;
602	glVertex $w, $h;	687	glVertex $w, $h;
…		…
607	}	692	}
608	}	693	}
609		694
610	#############################################################################	695	#############################################################################
611		696
612	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
613		698
614	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
615		700
616	sub new {	701	sub new {
617	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
618	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
619	}	704	}
620		705
621	sub size_request {	706	sub size_request {
622	(0, 0)	707	my ($self) = @_;
		708
		709	($self->{w} + 0, $self->{h} + 0)
623	}	710	}
624		711
625	sub draw { }	712	sub draw { }
626		713
627	#############################################################################	714	#############################################################################
628		715
629	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
630		717
631	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
632		719
633	sub new {	720	sub new {
634	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
635		722
636	my $children = delete $arg{children} || [];	723	my $children = delete $arg{children};
637		724
638	my $self = $class->SUPER::new (	725	my $self = $class->SUPER::new (
639	children => [],	726	children => [],
640	can_events => 0,	727	can_events => 0,
641	%arg,	728	%arg,
642	);	729	);
		730
643	$self->add ($_) for @$children;	731	$self->add (@$children)
		732	if $children;
644		733
645	$self	734	$self
		735	}
		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
646	}	743	}
647		744
648	sub add {	745	sub add {
649	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
650		747
…		…
656	$self->{children} = [	753	$self->{children} = [
657	sort { $a->{z} <=> $b->{z} }	754	sort { $a->{z} <=> $b->{z} }
658	@{$self->{children}}, @widgets	755	@{$self->{children}}, @widgets
659	];	756	];
660		757
661	$self->check_size (1);	758	$self->realloc;
662	$self->update;
663	}	759	}
664		760
665	sub children {	761	sub children {
666	@{ $_[0]{children} }	762	@{ $_[0]{children} }
667	}	763	}
…		…
672	delete $child->{parent};	768	delete $child->{parent};
673	$child->hide;	769	$child->hide;
674		770
675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	771	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676		772
677	$self->check_size (1);	773	$self->realloc;
678	$self->update;
679	}	774	}
680		775
681	sub clear {	776	sub clear {
682	my ($self) = @_;	777	my ($self) = @_;
683		778
…		…
687	for (@$children) {	782	for (@$children) {
688	delete $_->{parent};	783	delete $_->{parent};
689	$_->hide;	784	$_->hide;
690	}	785	}
691		786
692	$self->check_size;	787	$self->realloc;
693	$self->update;
694	}	788	}
695		789
696	sub find_widget {	790	sub find_widget {
697	my ($self, $x, $y) = @_;	791	my ($self, $x, $y) = @_;
698		792
699	$x -= $self->{x};	793	$x -= $self->{x};
700	$y -= $self->{y};	794	$y -= $self->{y};
701		795
702	my $res;	796	my $res;
703		797
704	for (reverse @{ $self->{children} }) {	798	for (reverse $self->visible_children) {
705	$res = $_->find_widget ($x, $y)	799	$res = $_->find_widget ($x, $y)
706	and return $res;	800	and return $res;
707	}	801	}
708		802
709	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	803	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
715	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
716	}	810	}
717		811
718	#############################################################################	812	#############################################################################
719		813
720	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
721		815
722	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
723		817
724	sub new {	818	sub new {
725	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
726		820
727	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
728		822
729	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
730	}	824	}
731		825
732	sub add {	826	sub add {
733	my ($self, $child) = @_;	827	my ($self, $child) = @_;
734		828
735	$self->{children} = [];	829	$self->SUPER::remove ($_) for @{ $self->{children} };
736
737	$self->SUPER::add ($child);	830	$self->SUPER::add ($child);
738	}	831	}
739		832
740	sub remove {	833	sub remove {
741	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
742		835
743	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
744		837
745	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
746	unless @{$self->{children}};	839	unless @{$self->{children}};
747	}	840	}
748		841
749	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
750		843
751	sub size_request {	844	sub size_request {
752	$_[0]{children}[0]->size_request	845	$_[0]{children}[0]->size_request
753	}	846	}
754		847
755	sub size_allocate {	848	sub invoke_size_allocate {
756	my ($self, $w, $h) = @_;	849	my ($self, $w, $h) = @_;
757		850
758	$self->{children}[0]->configure (0, 0, $w, $h);	851	$self->{children}[0]->configure (0, 0, $w, $h);
759	}
760		852
761	#############################################################################	853	1
		854	}
762		855
		856	#############################################################################
		857
		858	# back-buffered drawing area
		859
763	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
764		861
765	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
766		863
767	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
768		865
769	sub new {	866	sub new {
770	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
771		868
772	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
777		874
778	$ROOT->on_post_alloc ($self => sub { $self->render_child });	875	$ROOT->on_post_alloc ($self => sub { $self->render_child });
779	$self->SUPER::update;	876	$self->SUPER::update;
780	}	877	}
781		878
782	sub size_allocate {	879	sub invoke_size_allocate {
783	my ($self, $w, $h) = @_;	880	my ($self, $w, $h) = @_;
784		881
785	$self->SUPER::size_allocate ($w, $h);
786	$self->update;	882	$self->update;
		883
		884	$self->SUPER::invoke_size_allocate ($w, $h)
787	}	885	}
788		886
789	sub _render {	887	sub _render {
		888	my ($self) = @_;
		889
790	$_[0]{children}[0]->draw;	890	$self->{children}[0]->draw;
791	}	891	}
792		892
793	sub render_child {	893	sub render_child {
794	my ($self) = @_;	894	my ($self) = @_;
795		895
796	$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 {
797	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
799		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
800	$self->_render;	906	$self->_render;
		907	}
801	};	908	};
802	}	909	}
803		910
804	sub _draw {	911	sub _draw {
805	my ($self) = @_;	912	my ($self) = @_;
806
807	my ($w, $h) = ($self->w, $self->h);
808		913
809	my $tex = $self->{texture}	914	my $tex = $self->{texture}
810	or return;	915	or return;
811		916
812	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814	glColor 1, 1, 1, 1;	919	glColor 0, 0, 0, 1;
815		920
816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
817		922
818	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
819	}	924	}
820		925
821	#############################################################################	926	#############################################################################
822		927
823	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
824		929
825	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
826		931
827	sub new {	932	sub new {
828	my $class = shift;	933	my $class = shift;
829		934
830	$class->SUPER::new (	935	$class->SUPER::new (
…		…
835	}	940	}
836		941
837	sub size_request {	942	sub size_request {
838	my ($self) = @_;	943	my ($self) = @_;
839		944
840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	945	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		946
842	@$self{qw(child_w child_h)}	947	$w = 10 if $self->{scroll_x};
843	}	948	$h = 10 if $self->{scroll_y};
844		949
		950	($w, $h)
		951	}
		952
845	sub size_allocate {	953	sub invoke_size_allocate {
846	my ($self, $w, $h) = @_;	954	my ($self, $w, $h) = @_;
847		955
		956	my $child = $self->child;
		957
848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	958	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	959	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850		960
851	$self->child->configure (0, 0, $w, $h);	961	$self->child->configure (0, 0, $w, $h);
852	$self->update;	962	$self->update;
		963
		964	1
853	}	965	}
854		966
855	sub set_offset {	967	sub set_offset {
856	my ($self, $x, $y) = @_;	968	my ($self, $x, $y) = @_;
857		969
…		…
883	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
884	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
885	) {	997	) {
886	$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})
887	} else {	999	} else {
888	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
889	}	1001	}
890	}	1002	}
891		1003
892	sub _render {	1004	sub _render {
893	my ($self) = @_;	1005	my ($self) = @_;
894		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
895	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896		1011
897	$self->SUPER::_render;	1012	$self->SUPER::_render;
898	}	1013	}
899		1014
900	#############################################################################	1015	#############################################################################
901		1016
902	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
903		1018
904	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
905		1020
906	sub new {	1021	sub new {
907	my $class = shift;	1022	my ($class, %arg) = @_;
		1023
		1024	my $child = delete $arg{child};
908		1025
909	my $self;	1026	my $self;
910		1027
911	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
912	vertical => 1,	1029	vertical => 1,
913	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
914	on_changed => sub {	1031	on_changed => sub {
915	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
916	},	1033	},
917	;	1034	;
918		1035
919	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
920	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
921	slider => $slider,	1039	slider => $slider,
922	@_,	1040	%arg,
923	);	1041	);
924		1042
925	$self->{vp}->add ($self->{scrolled});
926	$self->add ($self->{vp});
927	$self->add ($self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
		1044	$self->add ($child) if $child;
928		1045
929	$self	1046	$self
930	}	1047	}
931		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
932	sub update {	1073	sub update {
933	my ($self) = @_;	1074	my ($self) = @_;
934		1075
935	$self->SUPER::update;	1076	$self->SUPER::update;
936		1077
937	# todo: overwrite size_allocate of child	1078	$self->update_slider;
938	my $child = $self->{vp}->child;
939	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940	}	1079	}
941		1080
942	sub size_allocate {	1081	sub invoke_size_allocate {
943	my ($self, $w, $h) = @_;	1082	my ($self, $w, $h) = @_;
944		1083
		1084	$self->update_slider;
		1085
945	$self->SUPER::size_allocate ($w, $h);	1086	$self->SUPER::invoke_size_allocate ($w, $h)
946
947	my $child = $self->{vp}->child;
948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949	}	1087	}
950		1088
951	#TODO# update range on size_allocate depending on child
952	# update viewport offset on scroll
953
954	#############################################################################	1089	#############################################################################
955		1090
956	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
957		1092
958	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
959		1094
960	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
961		1096
962	sub new {	1097	sub new {
963	my $class = shift;	1098	my $class = shift;
964		1099
965	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
973		1108
974	if ($self->{bg}) {	1109	if ($self->{bg}) {
975	my ($w, $h) = @$self{qw(w h)};	1110	my ($w, $h) = @$self{qw(w h)};
976		1111
977	glEnable GL_BLEND;	1112	glEnable GL_BLEND;
978	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1113	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979	glColor @{ $self->{bg} };	1114	glColor_premultiply @{ $self->{bg} };
980		1115
981	glBegin GL_QUADS;	1116	glBegin GL_QUADS;
982	glVertex 0 , 0;	1117	glVertex 0 , 0;
983	glVertex 0 , $h;	1118	glVertex 0 , $h;
984	glVertex $w, $h;	1119	glVertex $w, $h;
…		…
991	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
992	}	1127	}
993		1128
994	#############################################################################	1129	#############################################################################
995		1130
996	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
997		1132
998	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
999		1134
1000	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
1001
1002	my @tex =
1003	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005		1136
1006	sub new {	1137	sub new {
1007	my $class = shift;	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,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		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	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		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) = @_;
1008		1247
1009	my $self = $class->SUPER::new (	1248	my $self = $class->SUPER::new (
1010	bg => [1, 1, 1, 1],	1249	bg => [1, 1, 1, 1],
1011	border_bg => [1, 1, 1, 1],	1250	border_bg => [1, 1, 1, 1],
1012	border => 0.6,	1251	border => 0.6,
1013	is_toplevel => 1,
1014	can_events => 1,	1252	can_events => 1,
1015	@_	1253	min_w => 64,
		1254	min_h => 32,
		1255	%arg,
1016	);	1256	);
1017		1257
1018	$self->{title} &&= new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1019	align => 0,	1259	align => 0,
1020	valign => 1,	1260	valign => 1,
1021	text => $self->{title},	1261	text => $self->{title},
1022	fontsize => $self->{border};	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	}
1023		1273
1024	$self	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};
1025	}	1283	}
1026		1284
1027	sub border {	1285	sub border {
1028	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1029	}	1287	}
1030		1288
1031	sub size_request {	1289	sub size_request {
1032	my ($self) = @_;	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};
1033		1297
1034	my ($w, $h) = $self->SUPER::size_request;	1298	my ($w, $h) = $self->SUPER::size_request;
1035		1299
1036	(	1300	(
1037	$w + $self->border * 2,	1301	$w + $self->border * 2,
1038	$h + $self->border * 2,	1302	$h + $self->border * 2,
1039	)	1303	)
1040	}	1304	}
1041		1305
1042	sub size_allocate {	1306	sub invoke_size_allocate {
1043	my ($self, $w, $h) = @_;	1307	my ($self, $w, $h) = @_;
1044		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
1045	$h -= List::Util::max 0, $self->border * 2;	1317	$h -= List::Util::max 0, $border * 2;
1046	$w -= List::Util::max 0, $self->border * 2;	1318	$w -= List::Util::max 0, $border * 2;
1047		1319
1048	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1049	if $self->{title};
1050
1051	$self->child->configure ($self->border, $self->border, $w, $h);	1320	$self->child->configure ($border, $border, $w, $h);
1052	}
1053		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
1054	sub button_down {	1336	sub invoke_button_down {
1055	my ($self, $ev, $x, $y) = @_;	1337	my ($self, $ev, $x, $y) = @_;
1056		1338
1057	my ($w, $h) = @$self{qw(w h)};	1339	my ($w, $h) = @$self{qw(w h)};
1058	my $border = $self->border;	1340	my $border = $self->border;
1059		1341
…		…
1072	my ($ev, $x, $y) = @_;	1354	my ($ev, $x, $y) = @_;
1073		1355
1074	my $dx = $ev->{x} - $ox;	1356	my $dx = $ev->{x} - $ox;
1075	my $dy = $ev->{y} - $oy;	1357	my $dy = $ev->{y} - $oy;
1076		1358
1077	$self->{user_x} = $wx + $dx * $mx;
1078	$self->{user_y} = $wy + $dy * $my;
1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1359	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1360	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081	$self->move ($self->{user_x}, $self->{user_y});	1361
1082	$self->check_size;	1362	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
		1363	$self->realloc;
1083	};	1364	};
1084		1365
1085	} elsif ($lr ^ $td) {	1366	} elsif ($lr ^ $td) {
1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1367	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087	my ($bx, $by) = ($self->{x}, $self->{y});	1368	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1089	$self->{motion} = sub {	1370	$self->{motion} = sub {
1090	my ($ev, $x, $y) = @_;	1371	my ($ev, $x, $y) = @_;
1091		1372
1092	($x, $y) = ($ev->{x}, $ev->{y});	1373	($x, $y) = ($ev->{x}, $ev->{y});
1093		1374
1094	$self->{user_x} = $bx + $x - $ox;	1375	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095	$self->{user_y} = $by + $y - $oy;	1376	# HACK: the next line is required to enforce placement
1096		1377	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1097	$self->move ($self->{user_x}, $self->{user_y});
1098	$self->update;
1099	};	1378	};
		1379	} else {
		1380	return 0;
		1381	}
		1382
1100	}	1383	1
1101	}	1384	}
1102		1385
1103	sub button_up {	1386	sub invoke_button_up {
1104	my ($self, $ev, $x, $y) = @_;	1387	my ($self, $ev, $x, $y) = @_;
1105		1388
1106	delete $self->{motion};	1389	! ! delete $self->{motion}
1107	}	1390	}
1108		1391
1109	sub mouse_motion {	1392	sub invoke_mouse_motion {
1110	my ($self, $ev, $x, $y) = @_;	1393	my ($self, $ev, $x, $y) = @_;
1111		1394
1112	$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
1113	}	1406	}
1114		1407
1115	sub _draw {	1408	sub _draw {
1116	my ($self) = @_;	1409	my ($self) = @_;
1117		1410
		1411	my $child = $self->{children}[0];
		1412
1118	my ($w, $h ) = ($self->{w}, $self->{h});	1413	my ($w, $h ) = ($self->{w}, $self->{h});
1119	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1414	my ($cw, $ch) = ($child->{w}, $child->{h});
1120		1415
1121	glEnable GL_TEXTURE_2D;	1416	glEnable GL_TEXTURE_2D;
1122	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123		1418
1124	my $border = $self->border;	1419	my $border = $self->border;
1125		1420
1126	glColor @{ $self->{border_bg} };	1421	glColor @{ $self->{border_bg} };
1127	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1422	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1128	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1423	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1424	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1425	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131		1426
1132	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1427	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133	my $bg = $tex[0];	1428	glColor @{ $self->{bg} };
1134		1429
1135	# TODO: repeat texture not scale	1430	# TODO: repeat texture not scale
		1431	# solve this better(?)
1136	my $rep_x = $cw / $bg->{w};	1432	$bg->{s} = $cw / $bg->{w};
1137	my $rep_y = $ch / $bg->{h};	1433	$bg->{t} = $ch / $bg->{h};
1138
1139	glColor @{ $self->{bg} };
1140
1141	$bg->{s} = $rep_x;
1142	$bg->{t} = $rep_y;
1143	$bg->{wrap_mode} = 1;
1144	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1434	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145	}	1435	}
1146		1436
1147	glDisable GL_TEXTURE_2D;	1437	glDisable GL_TEXTURE_2D;
1148		1438
1149	$self->{title}->draw if $self->{title};
1150
1151	$self->child->draw;	1439	$child->draw;
1152	}
1153		1440
1154	#############################################################################	1441	if ($self->{title_widget}) {
		1442	glTranslate 0, $border - $self->{h};
		1443	$self->{title_widget}->_draw;
1155		1444
		1445	glTranslate 0, - ($border - $self->{h});
		1446	}
		1447
		1448	$self->{close_button}->draw
		1449	if $self->{close_button};
		1450	}
		1451
		1452	#############################################################################
		1453
1156	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1157		1455
1158	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1159		1457
1160	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1161		1459
1162	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1163		1461
1164	sub new {	1462	sub new {
1165	my $class = shift;	1463	my $class = shift;
1166		1464
1167	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1173	sub children {	1471	sub children {
1174	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1175	}	1473	}
1176		1474
1177	sub add {	1475	sub add {
1178	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1179		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1180	$child->set_parent ($self);	1480	$child->set_parent ($self);
1181	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1182		1483
1183	$self->check_size (1);	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
1184	}	1493	}
1185		1494
1186	# TODO: move to container class maybe? send children a signal on removal?	1495	# TODO: move to container class maybe? send children a signal on removal?
1187	sub clear {	1496	sub clear {
1188	my ($self) = @_;	1497	my ($self) = @_;
…		…
1193	for (@children) {	1502	for (@children) {
1194	delete $_->{parent};	1503	delete $_->{parent};
1195	$_->hide;	1504	$_->hide;
1196	}	1505	}
1197		1506
1198	$self->check_size (1);	1507	$self->realloc;
1199	$self->update;
1200	}	1508	}
1201		1509
1202	sub get_wh {	1510	sub get_wh {
1203	my ($self) = @_;	1511	my ($self) = @_;
1204		1512
…		…
1230	(sum @$ws),	1538	(sum @$ws),
1231	(sum @$hs),	1539	(sum @$hs),
1232	)	1540	)
1233	}	1541	}
1234		1542
1235	sub size_allocate {	1543	sub invoke_size_allocate {
1236	my ($self, $w, $h) = @_;	1544	my ($self, $w, $h) = @_;
1237		1545
1238	my ($ws, $hs) = $self->get_wh;	1546	my ($ws, $hs) = $self->get_wh;
1239		1547
1240	my $req_w = (sum @$ws) || 1;	1548	my $req_w = (sum @$ws) || 1;
…		…
1247		1555
1248	# linearly scale sizes	1556	# linearly scale sizes
1249	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1250	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1251		1559
1252	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1253	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1254		1562
1255	my $y;	1563	my $y;
1256		1564
1257	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1258	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1272	}	1580	}
1273		1581
1274	$y += $row_h;	1582	$y += $row_h;
1275	}	1583	}
1276		1584
		1585	1
1277	}	1586	}
1278		1587
1279	sub find_widget {	1588	sub find_widget {
1280	my ($self, $x, $y) = @_;	1589	my ($self, $x, $y) = @_;
1281		1590
…		…
1300	}	1609	}
1301	}	1610	}
1302		1611
1303	#############################################################################	1612	#############################################################################
1304		1613
1305	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1306		1615
1307	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1308		1617
1309	sub size_request {	1618	sub size_request {
1310	my ($self) = @_;	1619	my ($self) = @_;
1311		1620
1312	$self->{vertical}	1621	$self->{vertical}
…		…
1318	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1627	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1628	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1320	)	1629	)
1321	}	1630	}
1322		1631
1323	sub size_allocate {	1632	sub invoke_size_allocate {
1324	my ($self, $w, $h) = @_;	1633	my ($self, $w, $h) = @_;
1325		1634
1326	my $space = $self->{vertical} ? $h : $w;	1635	my $space = $self->{vertical} ? $h : $w;
1327	my $children = $self->{children};	1636	my @children = $self->visible_children;
1328		1637
1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1638	my @req;
1330	my $req = List::Util::sum @req;
1331		1639
1332	if ($req > $space) {	1640	if ($self->{homogeneous}) {
1333	# ah well, not enough space	1641	@req = ($space / (@children || 1)) x @children;
1334	$_ *= $space / $req for @req;
1335	} else {	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 {
1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1650	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1337		1651
		1652	$space = ($space - $req) / $expand; # remaining space to give away
		1653
1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand	1654	$req[$_] += $space * $children[$_]{expand}
1339	for 0 .. $#$children;	1655	for 0 .. $#children;
		1656	}
1340	}	1657	}
1341		1658
1342	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1343		1660
1344	my $pos = 0;	1661	my $pos = 0;
1345	for (0 .. $#$children) {	1662	for (0 .. $#children) {
1346	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1347	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1664	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1348		1665
1349	$pos += $alloc;	1666	$pos += $alloc;
1350	}	1667	}
1351		1668
1352	1	1669	1
1353	}	1670	}
1354		1671
1355	#############################################################################	1672	#############################################################################
1356		1673
1357	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1358		1675
1359	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1360		1677
1361	sub new {	1678	sub new {
1362	my $class = shift;	1679	my $class = shift;
1363		1680
1364	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1367	)	1684	)
1368	}	1685	}
1369		1686
1370	#############################################################################	1687	#############################################################################
1371		1688
1372	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1373		1690
1374	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1375		1692
1376	sub new {	1693	sub new {
1377	my $class = shift;	1694	my $class = shift;
1378		1695
1379	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1382	)	1699	)
1383	}	1700	}
1384		1701
1385	#############################################################################	1702	#############################################################################
1386		1703
1387	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1388		1705
1389	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1390		1707
1391	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1392		1709
1393	sub new {	1710	sub new {
1394	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1395		1712
1396	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1399	#active_bg => none	1716	#active_bg => none
1400	#font => default_font	1717	#font => default_font
1401	#text => initial text	1718	#text => initial text
1402	#markup => initial narkup	1719	#markup => initial narkup
1403	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1404	ellipsise => 3, # end	1722	ellipsise => 3, # end
1405	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1406	fontsize => 1,	1724	fontsize => 1,
1407	align => -1,	1725	align => -1,
1408	valign => -1,	1726	valign => -1,
1409	padding => 2,	1727	padding_x => 2,
		1728	padding_y => 2,
1410	can_events => 0,	1729	can_events => 0,
1411	%arg	1730	%arg
1412	);	1731	);
1413		1732
1414	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1415	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1416	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1417	$self->{template} = $layout;	1736	$self->{template} = $layout;
1418	}	1737	}
1419		1738
1420	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1424	}	1743	}
1425		1744
1426	$self	1745	$self
1427	}	1746	}
1428		1747
1429	sub escape($) {
1430	local $_ = $_[0];
1431
1432	s/&/&amp;/g;
1433	s/>/&gt;/g;
1434	s/</&lt;/g;
1435
1436	$_
1437	}
1438
1439	sub update {	1748	sub update {
1440	my ($self) = @_;	1749	my ($self) = @_;
1441		1750
1442	delete $self->{texture};	1751	delete $self->{texture};
1443	$self->SUPER::update;	1752	$self->SUPER::update;
1444	}	1753	}
1445		1754
		1755	sub realloc {
		1756	my ($self) = @_;
		1757
		1758	delete $self->{ox};
		1759	$self->SUPER::realloc;
		1760	}
		1761
1446	sub set_text {	1762	sub set_text {
1447	my ($self, $text) = @_;	1763	my ($self, $text) = @_;
1448		1764
1449	return if $self->{text} eq "T$text";	1765	return if $self->{text} eq "T$text";
1450	$self->{text} = "T$text";	1766	$self->{text} = "T$text";
1451		1767
1452	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453	$self->{layout}->set_text ($text);	1768	$self->{layout}->set_text ($text);
1454		1769
		1770	delete $self->{size_req};
		1771	$self->realloc;
1455	$self->update;	1772	$self->update;
1456	$self->check_size;
1457	}	1773	}
1458		1774
1459	sub set_markup {	1775	sub set_markup {
1460	my ($self, $markup) = @_;	1776	my ($self, $markup) = @_;
1461		1777
1462	return if $self->{text} eq "M$markup";	1778	return if $self->{text} eq "M$markup";
1463	$self->{text} = "M$markup";	1779	$self->{text} = "M$markup";
1464		1780
1465	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1781	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466		1782
1467	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1468	$self->{layout}->set_markup ($markup);	1783	$self->{layout}->set_markup ($markup);
1469		1784
		1785	delete $self->{size_req};
		1786	$self->realloc;
1470	$self->update;	1787	$self->update;
1471	$self->check_size;
1472	}	1788	}
1473		1789
1474	sub size_request {	1790	sub size_request {
1475	my ($self) = @_;	1791	my ($self) = @_;
1476		1792
		1793	$self->{size_req} ||= do {
1477	$self->{layout}->set_font ($self->{font}) if $self->{font};	1794	$self->{layout}->set_font ($self->{font}) if $self->{font};
1478	$self->{layout}->set_width ($self->{max_w} || -1);	1795	$self->{layout}->set_width ($self->{max_w} || -1);
1479	$self->{layout}->set_ellipsise ($self->{ellipsise});	1796	$self->{layout}->set_ellipsise ($self->{ellipsise});
1480	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1797	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1481	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1798	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1482		1799
1483	my ($w, $h) = $self->{layout}->size;	1800	my ($w, $h) = $self->{layout}->size;
1484		1801
1485	if (exists $self->{template}) {	1802	if (exists $self->{template}) {
1486	$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);
1487	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1488		1806
1489	my ($w2, $h2) = $self->{template}->size;	1807	my ($w2, $h2) = $self->{template}->size;
1490		1808
1491	$w = List::Util::max $w, $w2;	1809	$w = List::Util::max $w, $w2;
1492	$h = List::Util::max $h, $h2;	1810	$h = List::Util::max $h, $h2;
		1811	}
		1812
		1813	[$w, $h]
1493	}	1814	};
1494		1815
1495	(	1816	@{ $self->{size_req} }
1496	$w + $self->{padding} * 2,
1497	$h + $self->{padding} * 2,
1498	)
1499	}	1817	}
1500		1818
		1819	sub baseline_shift {
		1820	$_[0]{layout}->descent
		1821	}
		1822
1501	sub size_allocate {	1823	sub invoke_size_allocate {
1502	my ($self, $w, $h) = @_;	1824	my ($self, $w, $h) = @_;
1503		1825
		1826	delete $self->{ox};
		1827
1504	delete $self->{texture};	1828	delete $self->{texture}
		1829	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1830
		1831	1
1505	}	1832	}
1506		1833
1507	sub set_fontsize {	1834	sub set_fontsize {
1508	my ($self, $fontsize) = @_;	1835	my ($self, $fontsize) = @_;
1509		1836
1510	$self->{fontsize} = $fontsize;	1837	$self->{fontsize} = $fontsize;
		1838	delete $self->{size_req};
1511	delete $self->{texture};	1839	delete $self->{texture};
1512		1840
1513	$self->update;	1841	$self->realloc;
1514	$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;
1515	}	1851	}
1516		1852
1517	sub _draw {	1853	sub _draw {
1518	my ($self) = @_;	1854	my ($self) = @_;
1519		1855
1520	$self->SUPER::_draw; # draw background, if applicable	1856	$self->SUPER::_draw; # draw background, if applicable
1521		1857
1522	my $tex = $self->{texture} ||= do {	1858	my $size = $self->{texture} ||= do {
1523	$self->{layout}->set_foreground (@{$self->{fg}});	1859	$self->{layout}->set_foreground (@{$self->{fg}});
1524	$self->{layout}->set_font ($self->{font}) if $self->{font};	1860	$self->{layout}->set_font ($self->{font}) if $self->{font};
1525	$self->{layout}->set_width ($self->{w});	1861	$self->{layout}->set_width ($self->{w});
1526	$self->{layout}->set_ellipsise ($self->{ellipsise});	1862	$self->{layout}->set_ellipsise ($self->{ellipsise});
1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1863	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1864	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529		1865
1530	my $tex = new_from_layout CFClient::Texture $self->{layout};	1866	[$self->{layout}->size]
1531
1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1534	: ($self->{w} - $tex->{w}) * 0.5);
1535
1536	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1537	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1538	: ($self->{h} - $tex->{h}) * 0.5);
1539
1540	$tex
1541	};	1867	};
1542		1868
1543	glEnable GL_TEXTURE_2D;	1869	unless (exists $self->{ox}) {
1544	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1870	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
		1871	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
		1872	: ($self->{w} - $size->[0]) * 0.5);
1545		1873
1546	if ($tex->{format} == GL_ALPHA) {	1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547	glColor @{$self->{fg}};	1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1548	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1876	: ($self->{h} - $size->[1]) * 0.5);
1549	} else {
1550	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1551	}	1877	};
1552		1878
1553	glDisable GL_TEXTURE_2D;	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1554	}	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1555		1881
1556	#############################################################################	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		1883	}
1557		1884
		1885	#############################################################################
		1886
1558	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1559		1888
1560	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1561		1890
1562	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1563		1892
1564	sub new {	1893	sub new {
1565	my $class = shift;	1894	my $class = shift;
1566		1895
1567	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1571	active_fg => [0, 0, 0],	1900	active_fg => [0, 0, 0],
1572	can_hover => 1,	1901	can_hover => 1,
1573	can_focus => 1,	1902	can_focus => 1,
1574	valign => 0,	1903	valign => 0,
1575	can_events => 1,	1904	can_events => 1,
		1905	ellipsise => 0,
1576	#text => ...	1906	#text => ...
		1907	#hidden => "*",
1577	@_	1908	@_
1578	)	1909	)
1579	}	1910	}
1580		1911
1581	sub _set_text {	1912	sub _set_text {
…		…
1583		1914
1584	delete $self->{cur_h};	1915	delete $self->{cur_h};
1585		1916
1586	return if $self->{text} eq $text;	1917	return if $self->{text} eq $text;
1587		1918
1588	delete $self->{texture};
1589
1590	$self->{last_activity} = $::NOW;	1919	$self->{last_activity} = $::NOW;
1591	$self->{text} = $text;	1920	$self->{text} = $text;
1592		1921
1593	$text =~ s/./*/g if $self->{hidden};	1922	$text =~ s/./*/g if $self->{hidden};
1594	$self->{layout}->set_text ("$text ");	1923	$self->{layout}->set_text ("$text ");
		1924	delete $self->{size_req};
1595		1925
1596	$self->_emit (changed => $self->{text});	1926	$self->emit (changed => $self->{text});
		1927
		1928	$self->realloc;
		1929	$self->update;
1597	}	1930	}
1598		1931
1599	sub set_text {	1932	sub set_text {
1600	my ($self, $text) = @_;	1933	my ($self, $text) = @_;
1601		1934
1602	$self->{cursor} = length $text;	1935	$self->{cursor} = length $text;
1603	$self->_set_text ($text);	1936	$self->_set_text ($text);
1604	$self->update;
1605	$self->check_size;
1606	}	1937	}
1607		1938
1608	sub get_text {	1939	sub get_text {
1609	$_[0]{text}	1940	$_[0]{text}
1610	}	1941	}
…		…
1615	my ($w, $h) = $self->SUPER::size_request;	1946	my ($w, $h) = $self->SUPER::size_request;
1616		1947
1617	($w + 1, $h) # add 1 for cursor	1948	($w + 1, $h) # add 1 for cursor
1618	}	1949	}
1619		1950
1620	sub key_down {	1951	sub invoke_key_down {
1621	my ($self, $ev) = @_;	1952	my ($self, $ev) = @_;
1622		1953
1623	my $mod = $ev->{mod};	1954	my $mod = $ev->{mod};
1624	my $sym = $ev->{sym};	1955	my $sym = $ev->{sym};
1625	my $uni = $ev->{unicode};	1956	my $uni = $ev->{unicode};
…		…
1628		1959
1629	if ($uni == 8) {	1960	if ($uni == 8) {
1630	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1961	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1631	} elsif ($uni == 127) {	1962	} elsif ($uni == 127) {
1632	substr $text, $self->{cursor}, 1, "";	1963	substr $text, $self->{cursor}, 1, "";
1633	} elsif ($sym == CFClient::SDLK_LEFT) {	1964	} elsif ($sym == CFPlus::SDLK_LEFT) {
1634	--$self->{cursor} if $self->{cursor};	1965	--$self->{cursor} if $self->{cursor};
1635	} elsif ($sym == CFClient::SDLK_RIGHT) {	1966	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1636	++$self->{cursor} if $self->{cursor} < length $self->{text};	1967	++$self->{cursor} if $self->{cursor} < length $self->{text};
1637	} elsif ($sym == CFClient::SDLK_HOME) {	1968	} elsif ($sym == CFPlus::SDLK_HOME) {
1638	$self->{cursor} = 0;	1969	$self->{cursor} = 0;
1639	} elsif ($sym == CFClient::SDLK_END) {	1970	} elsif ($sym == CFPlus::SDLK_END) {
1640	$self->{cursor} = length $text;	1971	$self->{cursor} = length $text;
		1972	} elsif ($uni == 21) { # ctrl-u
		1973	$text = "";
		1974	$self->{cursor} = 0;
1641	} elsif ($uni == 27) {	1975	} elsif ($uni == 27) {
1642	$self->_emit ('escape');	1976	$self->emit ('escape');
1643	} elsif ($uni) {	1977	} elsif ($uni) {
1644	substr $text, $self->{cursor}++, 0, chr $uni;	1978	substr $text, $self->{cursor}++, 0, chr $uni;
		1979	} else {
		1980	return 0;
1645	}	1981	}
1646		1982
1647	$self->_set_text ($text);	1983	$self->_set_text ($text);
		1984
		1985	$self->realloc;
1648	$self->update;	1986	$self->update;
1649	$self->check_size;
1650	}
1651		1987
		1988	1
		1989	}
		1990
1652	sub focus_in {	1991	sub invoke_focus_in {
1653	my ($self) = @_;	1992	my ($self) = @_;
1654		1993
1655	$self->{last_activity} = $::NOW;	1994	$self->{last_activity} = $::NOW;
1656		1995
1657	$self->SUPER::focus_in;	1996	$self->SUPER::invoke_focus_in
1658	}	1997	}
1659		1998
1660	sub button_down {	1999	sub invoke_button_down {
1661	my ($self, $ev, $x, $y) = @_;	2000	my ($self, $ev, $x, $y) = @_;
1662		2001
1663	$self->SUPER::button_down ($ev, $x, $y);	2002	$self->SUPER::invoke_button_down ($ev, $x, $y);
1664		2003
1665	my $idx = $self->{layout}->xy_to_index ($x, $y);	2004	my $idx = $self->{layout}->xy_to_index ($x, $y);
1666		2005
1667	# byte-index to char-index	2006	# byte-index to char-index
1668	my $text = $self->{text};	2007	my $text = $self->{text};
1669	utf8::encode $text;	2008	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1670	$self->{cursor} = length substr $text, 0, $idx;	2009	$self->{cursor} = length $text;
1671		2010
1672	$self->_set_text ($self->{text});	2011	$self->_set_text ($self->{text});
1673	$self->update;	2012	$self->update;
		2013
		2014	1
1674	}	2015	}
1675		2016
1676	sub mouse_motion {	2017	sub invoke_mouse_motion {
1677	my ($self, $ev, $x, $y) = @_;	2018	my ($self, $ev, $x, $y) = @_;
1678	# 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
1679	}	2022	}
1680		2023
1681	sub _draw {	2024	sub _draw {
1682	my ($self) = @_;	2025	my ($self) = @_;
1683		2026
1684	local $self->{fg} = $self->{fg};	2027	local $self->{fg} = $self->{fg};
1685		2028
1686	if ($FOCUS == $self) {	2029	if ($FOCUS == $self) {
1687	glColor @{$self->{active_bg}};	2030	glColor_premultiply @{$self->{active_bg}};
1688	$self->{fg} = $self->{active_fg};	2031	$self->{fg} = $self->{active_fg};
1689	} else {	2032	} else {
1690	glColor @{$self->{bg}};	2033	glColor_premultiply @{$self->{bg}};
1691	}	2034	}
1692		2035
1693	glEnable GL_BLEND;	2036	glEnable GL_BLEND;
1694	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2037	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1695	glBegin GL_QUADS;	2038	glBegin GL_QUADS;
1696	glVertex 0 , 0;	2039	glVertex 0 , 0;
1697	glVertex 0 , $self->{h};	2040	glVertex 0 , $self->{h};
1698	glVertex $self->{w}, $self->{h};	2041	glVertex $self->{w}, $self->{h};
1699	glVertex $self->{w}, 0;	2042	glVertex $self->{w}, 0;
…		…
1710	utf8::encode $text;	2053	utf8::encode $text;
1711		2054
1712	@$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)
1713	}	2056	}
1714		2057
1715	glColor @{$self->{fg}};
1716	glBegin GL_LINES;	2058	glBegin GL_LINES;
1717	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};
1718	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};
1719	glEnd;	2061	glEnd;
1720	}	2062	}
1721	}	2063	}
1722		2064
		2065	#############################################################################
		2066
1723	package CFClient::UI::Entry;	2067	package CFPlus::UI::Entry;
1724		2068
1725	our @ISA = CFClient::UI::EntryBase::;	2069	our @ISA = CFPlus::UI::EntryBase::;
1726		2070
1727	use CFClient::OpenGL;	2071	use CFPlus::OpenGL;
1728		2072
1729	sub key_down {	2073	sub invoke_key_down {
1730	my ($self, $ev) = @_;	2074	my ($self, $ev) = @_;
1731		2075
1732	my $sym = $ev->{sym};	2076	my $sym = $ev->{sym};
1733		2077
1734	if ($sym == 13) {	2078	if ($sym == 13) {
1735	unshift @{$self->{history}},	2079	unshift @{$self->{history}},
1736	my $txt = $self->get_text;	2080	my $txt = $self->get_text;
		2081
1737	$self->{history_pointer} = -1;	2082	$self->{history_pointer} = -1;
1738	$self->{history_saveback} = '';	2083	$self->{history_saveback} = '';
1739	$self->_emit (activate => $txt);	2084	$self->emit (activate => $txt);
1740	$self->update;	2085	$self->update;
1741		2086
1742	} elsif ($sym == CFClient::SDLK_UP) {	2087	} elsif ($sym == CFPlus::SDLK_UP) {
1743	if ($self->{history_pointer} < 0) {	2088	if ($self->{history_pointer} < 0) {
1744	$self->{history_saveback} = $self->get_text;	2089	$self->{history_saveback} = $self->get_text;
1745	}	2090	}
1746	if (@{$self->{history} || []} > 0) {	2091	if (@{$self->{history} || []} > 0) {
1747	$self->{history_pointer}++;	2092	$self->{history_pointer}++;
…		…
1749	$self->{history_pointer} = @{$self->{history} || []} - 1;	2094	$self->{history_pointer} = @{$self->{history} || []} - 1;
1750	}	2095	}
1751	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2096	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1752	}	2097	}
1753		2098
1754	} elsif ($sym == CFClient::SDLK_DOWN) {	2099	} elsif ($sym == CFPlus::SDLK_DOWN) {
1755	$self->{history_pointer}--;	2100	$self->{history_pointer}--;
1756	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2101	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1757		2102
1758	if ($self->{history_pointer} >= 0) {	2103	if ($self->{history_pointer} >= 0) {
1759	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2104	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1760	} else {	2105	} else {
1761	$self->set_text ($self->{history_saveback});	2106	$self->set_text ($self->{history_saveback});
1762	}	2107	}
1763		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);
1764	} else {	2148	} else {
1765	$self->SUPER::key_down ($ev);	2149	return $self->SUPER::invoke_key_down ($ev)
		2150	}
		2151
1766	}	2152	1
1767
1768	}	2153	}
1769		2154
1770	#############################################################################	2155	#############################################################################
1771		2156
1772	package CFClient::UI::Button;	2157	package CFPlus::UI::Button;
1773		2158
1774	our @ISA = CFClient::UI::Label::;	2159	our @ISA = CFPlus::UI::Label::;
1775		2160
1776	use CFClient::OpenGL;	2161	use CFPlus::OpenGL;
1777		2162
1778	my @tex =	2163	my @tex =
1779	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2164	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1780	qw(b1_button_active.png);	2165	qw(b1_button_active.png);
1781		2166
1782	sub new {	2167	sub new {
1783	my $class = shift;	2168	my $class = shift;
1784		2169
1785	$class->SUPER::new (	2170	$class->SUPER::new (
1786	padding => 4,	2171	padding_x => 4,
		2172	padding_y => 4,
1787	fg => [1, 1, 1],	2173	fg => [1, 1, 1],
1788	active_fg => [0, 0, 1],	2174	active_fg => [0, 0, 1],
1789	can_hover => 1,	2175	can_hover => 1,
1790	align => 0,	2176	align => 0,
1791	valign => 0,	2177	valign => 0,
1792	can_events => 1,	2178	can_events => 1,
1793	@_	2179	@_
1794	)	2180	)
1795	}	2181	}
1796		2182
1797	sub activate { }
1798
1799	sub button_up {	2183	sub invoke_button_up {
1800	my ($self, $ev, $x, $y) = @_;	2184	my ($self, $ev, $x, $y) = @_;
1801		2185
1802	$self->emit ("activate")	2186	$self->emit ("activate")
1803	if $x >= 0 && $x < $self->{w}	2187	if $x >= 0 && $x < $self->{w}
1804	&& $y >= 0 && $y < $self->{h};	2188	&& $y >= 0 && $y < $self->{h};
		2189
		2190	1
1805	}	2191	}
1806		2192
1807	sub _draw {	2193	sub _draw {
1808	my ($self) = @_;	2194	my ($self) = @_;
1809		2195
1810	local $self->{fg} = $self->{fg};	2196	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1811
1812	if ($GRAB == $self) {
1813	$self->{fg} = $self->{active_fg};
1814	}
1815		2197
1816	glEnable GL_TEXTURE_2D;	2198	glEnable GL_TEXTURE_2D;
1817	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2199	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1818	glColor 0, 0, 0, 1;	2200	glColor 0, 0, 0, 1;
1819		2201
…		…
1824	$self->SUPER::_draw;	2206	$self->SUPER::_draw;
1825	}	2207	}
1826		2208
1827	#############################################################################	2209	#############################################################################
1828		2210
1829	package CFClient::UI::CheckBox;	2211	package CFPlus::UI::CheckBox;
1830		2212
1831	our @ISA = CFClient::UI::DrawBG::;	2213	our @ISA = CFPlus::UI::DrawBG::;
1832		2214
1833	my @tex =	2215	my @tex =
1834	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2216	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1835	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2217	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1836		2218
1837	use CFClient::OpenGL;	2219	use CFPlus::OpenGL;
1838		2220
1839	sub new {	2221	sub new {
1840	my $class = shift;	2222	my $class = shift;
1841		2223
1842	$class->SUPER::new (	2224	$class->SUPER::new (
1843	padding => 2,	2225	padding_x => 2,
		2226	padding_y => 2,
1844	fg => [1, 1, 1],	2227	fg => [1, 1, 1],
1845	active_fg => [1, 1, 0],	2228	active_fg => [1, 1, 0],
1846	bg => [0, 0, 0, 0.2],	2229	bg => [0, 0, 0, 0.2],
1847	active_bg => [1, 1, 1, 0.5],	2230	active_bg => [1, 1, 1, 0.5],
1848	state => 0,	2231	state => 0,
…		…
1852	}	2235	}
1853		2236
1854	sub size_request {	2237	sub size_request {
1855	my ($self) = @_;	2238	my ($self) = @_;
1856		2239
1857	($self->{padding} * 2 + 6) x 2	2240	(6) x 2
1858	}	2241	}
1859		2242
		2243	sub toggle {
		2244	my ($self) = @_;
		2245
		2246	$self->{state} = !$self->{state};
		2247	$self->emit (changed => $self->{state});
		2248	$self->update;
		2249	}
		2250
1860	sub button_down {	2251	sub invoke_button_down {
1861	my ($self, $ev, $x, $y) = @_;	2252	my ($self, $ev, $x, $y) = @_;
1862		2253
1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2254	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2255	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865	$self->{state} = !$self->{state};	2256	$self->toggle;
1866	$self->_emit (changed => $self->{state});	2257	} else {
		2258	return 0
		2259	}
		2260
1867	}	2261	1
1868	}	2262	}
1869		2263
1870	sub _draw {	2264	sub _draw {
1871	my ($self) = @_;	2265	my ($self) = @_;
1872		2266
1873	$self->SUPER::_draw;	2267	$self->SUPER::_draw;
1874		2268
1875	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2269	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876		2270
1877	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;
1878		2274
1879	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2275	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880		2276
1881	my $tex = $self->{state} ? $tex[1] : $tex[0];	2277	my $tex = $self->{state} ? $tex[1] : $tex[0];
1882		2278
…		…
1885	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
1886	}	2282	}
1887		2283
1888	#############################################################################	2284	#############################################################################
1889		2285
1890	package CFClient::UI::Image;	2286	package CFPlus::UI::Image;
1891		2287
1892	our @ISA = CFClient::UI::Base::;	2288	our @ISA = CFPlus::UI::Base::;
1893		2289
1894	use CFClient::OpenGL;	2290	use CFPlus::OpenGL;
1895	use Carp qw/confess/;
1896		2291
1897	our %loaded_images;	2292	our %texture_cache;
1898		2293
1899	sub new {	2294	sub new {
1900	my $class = shift;	2295	my $class = shift;
1901		2296
1902	my $self = $class->SUPER::new (can_events => 0, @_);	2297	my $self = $class->SUPER::new (
		2298	can_events => 0,
		2299	@_,
		2300	);
1903		2301
1904	$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";
1905		2304
1906	$loaded_images{$self->{image}} ||=	2305	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1907	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;
1908		2307
1909	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2308	Scalar::Util::weaken $texture_cache{$self->{path}};
1910		2309
1911	Scalar::Util::weaken $loaded_images{$self->{image}};	2310	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1912
1913	$self->{aspect} = $tex->{w} / $tex->{h};
1914		2311
1915	$self	2312	$self
1916	}	2313	}
1917		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
1918	sub size_request {	2330	sub size_request {
1919	my ($self) = @_;	2331	my ($self) = @_;
1920		2332
1921	($self->{tex}->{w}, $self->{tex}->{h})	2333	($self->{tex}{w}, $self->{tex}{h})
1922	}	2334	}
1923		2335
1924	sub _draw {	2336	sub _draw {
1925	my ($self) = @_;	2337	my ($self) = @_;
1926		2338
…		…
1936	}	2348	}
1937		2349
1938	glEnable GL_TEXTURE_2D;	2350	glEnable GL_TEXTURE_2D;
1939	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2351	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1940		2352
1941	$tex->draw_quad_alpha (0, 0, $w, $h);	2353	$tex->draw_quad (0, 0, $w, $h);
1942		2354
1943	glDisable GL_TEXTURE_2D;	2355	glDisable GL_TEXTURE_2D;
1944	}	2356	}
1945		2357
1946	#############################################################################	2358	#############################################################################
1947		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
1948	package CFClient::UI::VGauge;	2396	package CFPlus::UI::VGauge;
1949		2397
1950	our @ISA = CFClient::UI::Base::;	2398	our @ISA = CFPlus::UI::Base::;
1951		2399
1952	use List::Util qw(min max);	2400	use List::Util qw(min max);
1953		2401
1954	use CFClient::OpenGL;	2402	use CFPlus::OpenGL;
1955		2403
1956	my %tex = (	2404	my %tex = (
1957	food => [	2405	food => [
1958	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2406	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2407	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1960	],	2408	],
1961	grace => [	2409	grace => [
1962	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2410	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1963	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/
1964	],	2412	],
1965	hp => [	2413	hp => [
1966	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2414	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1967	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2415	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1968	],	2416	],
1969	mana => [	2417	mana => [
1970	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2418	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971	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/
1972	],	2420	],
1973	);	2421	);
1974		2422
1975	# eg. VGauge->new (gauge => 'food'), default gauge: food	2423	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2035	my $ycut1 = max 0, min 1, $ycut;	2483	my $ycut1 = max 0, min 1, $ycut;
2036	my $ycut2 = max 0, min 1, $ycut - 1;	2484	my $ycut2 = max 0, min 1, $ycut - 1;
2037		2485
2038	my $h1 = $self->{h} * (1 - $ycut1);	2486	my $h1 = $self->{h} * (1 - $ycut1);
2039	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);
2040		2491
2041	glEnable GL_BLEND;	2492	glEnable GL_BLEND;
2042	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;
2043	glEnable GL_TEXTURE_2D;	2495	glEnable GL_TEXTURE_2D;
2044	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2045		2497
2046	glBindTexture GL_TEXTURE_2D, $t1->{name};	2498	glBindTexture GL_TEXTURE_2D, $t1->{name};
2047	glBegin GL_QUADS;	2499	glBegin GL_QUADS;
…		…
2062		2514
2063	if ($t3) {	2515	if ($t3) {
2064	glBindTexture GL_TEXTURE_2D, $t3->{name};	2516	glBindTexture GL_TEXTURE_2D, $t3->{name};
2065	glBegin GL_QUADS;	2517	glBegin GL_QUADS;
2066	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2518	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2067	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2519	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2068	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2520	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2069	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2521	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2070	glEnd;	2522	glEnd;
2071	}	2523	}
2072		2524
2073	glDisable GL_BLEND;	2525	glDisable GL_BLEND;
2074	glDisable GL_TEXTURE_2D;	2526	glDisable GL_TEXTURE_2D;
2075	}	2527	}
2076		2528
2077	#############################################################################	2529	#############################################################################
2078		2530
2079	package CFClient::UI::Gauge;	2531	package CFPlus::UI::Gauge;
2080		2532
2081	our @ISA = CFClient::UI::VBox::;	2533	our @ISA = CFPlus::UI::VBox::;
2082		2534
2083	sub new {	2535	sub new {
2084	my ($class, %arg) = @_;	2536	my ($class, %arg) = @_;
2085		2537
2086	my $self = $class->SUPER::new (	2538	my $self = $class->SUPER::new (
…		…
2088	can_hover => 1,	2540	can_hover => 1,
2089	can_events => 1,	2541	can_events => 1,
2090	%arg,	2542	%arg,
2091	);	2543	);
2092		2544
2093	$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");
2094	$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);
2095	$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");
2096		2548
2097	$self	2549	$self
2098	}	2550	}
2099		2551
2100	sub set_fontsize {	2552	sub set_fontsize {
…		…
2121	$self->{value}->set_text ($val);	2573	$self->{value}->set_text ($val);
2122	}	2574	}
2123		2575
2124	#############################################################################	2576	#############################################################################
2125		2577
2126	package CFClient::UI::Slider;	2578	package CFPlus::UI::Slider;
2127		2579
2128	use strict;	2580	use strict;
2129		2581
2130	use CFClient::OpenGL;	2582	use CFPlus::OpenGL;
2131		2583
2132	our @ISA = CFClient::UI::DrawBG::;	2584	our @ISA = CFPlus::UI::DrawBG::;
2133		2585
2134	my @tex =	2586	my @tex =
2135	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2587	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2136	qw(s1_slider.png s1_slider_bg.png);	2588	qw(s1_slider.png s1_slider_bg.png);
2137		2589
2138	sub new {	2590	sub new {
2139	my $class = shift;	2591	my $class = shift;
2140		2592
…		…
2147	fg => [1, 1, 1],	2599	fg => [1, 1, 1],
2148	active_fg => [0, 0, 0],	2600	active_fg => [0, 0, 0],
2149	bg => [0, 0, 0, 0.2],	2601	bg => [0, 0, 0, 0.2],
2150	active_bg => [1, 1, 1, 0.5],	2602	active_bg => [1, 1, 1, 0.5],
2151	range => [0, 0, 100, 10, 0],	2603	range => [0, 0, 100, 10, 0],
2152	req_w => $::WIDTH / 80,	2604	min_w => $::WIDTH / 80,
2153	req_h => $::WIDTH / 80,	2605	min_h => $::WIDTH / 80,
2154	vertical => 0,	2606	vertical => 0,
2155	can_hover => 1,	2607	can_hover => 1,
2156	inner_pad => 0.02,	2608	inner_pad => 0.02,
2157	@_	2609	@_
2158	);	2610	);
…		…
2166	sub set_range {	2618	sub set_range {
2167	my ($self, $range) = @_;	2619	my ($self, $range) = @_;
2168		2620
2169	($range, $self->{range}) = ($self->{range}, $range);	2621	($range, $self->{range}) = ($self->{range}, $range);
2170		2622
2171	$self->update
2172	if "@$range" ne "@{$self->{range}}";	2623	if ("@$range" ne "@{$self->{range}}") {
		2624	$self->update;
		2625	$self->set_value ($self->{range}[0]);
		2626	}
2173	}	2627	}
2174		2628
2175	sub set_value {	2629	sub set_value {
2176	my ($self, $value) = @_;	2630	my ($self, $value) = @_;
2177		2631
…		…
2188	if $unit;	2642	if $unit;
2189		2643
2190	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2644	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2191		2645
2192	if ($value != $old_value) {	2646	if ($value != $old_value) {
2193	$self->_emit (changed => $value);	2647	$self->emit (changed => $value);
2194	$self->update;	2648	$self->update;
2195	}	2649	}
2196	}	2650	}
2197		2651
2198	sub size_request {	2652	sub size_request {
2199	my ($self) = @_;	2653	my ($self) = @_;
2200		2654
2201	my $w = $self->{req_w};	2655	($self->{req_w}, $self->{req_h})
2202	my $h = $self->{req_h};
2203
2204	$self->{vertical} ? ($h, $w) : ($w, $h)
2205	}	2656	}
2206		2657
2207	sub button_down {	2658	sub invoke_button_down {
2208	my ($self, $ev, $x, $y) = @_;	2659	my ($self, $ev, $x, $y) = @_;
2209		2660
2210	$self->SUPER::button_down ($ev, $x, $y);	2661	$self->SUPER::invoke_button_down ($ev, $x, $y);
2211		2662
2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2663	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213		2664
2214	$self->mouse_motion ($ev, $x, $y);	2665	$self->invoke_mouse_motion ($ev, $x, $y)
2215	}	2666	}
2216		2667
2217	sub mouse_motion {	2668	sub invoke_mouse_motion {
2218	my ($self, $ev, $x, $y) = @_;	2669	my ($self, $ev, $x, $y) = @_;
2219		2670
2220	if ($GRAB == $self) {	2671	if ($GRAB == $self) {
2221	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2672	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2222		2673
2223	my (undef, $lo, $hi, $page) = @{$self->{range}};	2674	my (undef, $lo, $hi, $page) = @{$self->{range}};
2224		2675
2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2676	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226		2677
2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2678	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2679	} else {
		2680	return 0;
		2681	}
		2682
2228	}	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
2229	}	2694	}
2230		2695
2231	sub update {	2696	sub update {
2232	my ($self) = @_;	2697	my ($self) = @_;
2233		2698
2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2699	delete $self->{knob_w};
		2700	$self->SUPER::update;
		2701	}
		2702
		2703	sub _draw {
		2704	my ($self) = @_;
		2705
		2706	unless ($self->{knob_w}) {
2235	$self->set_value ($self->{range}[0]);	2707	$self->set_value ($self->{range}[0]);
2236		2708
2237	my ($value, $lo, $hi, $page) = @{$self->{range}};	2709	my ($value, $lo, $hi, $page) = @{$self->{range}};
2238	my $range = ($hi - $page - $lo) || 1e-100;	2710	my $range = ($hi - $page - $lo) || 1e-100;
2239		2711
…		…
2245	$value = ($value - $lo) / $range;	2717	$value = ($value - $lo) / $range;
2246	$value = $value * $self->{scale} + $self->{offset};	2718	$value = $value * $self->{scale} + $self->{offset};
2247		2719
2248	$self->{knob_x} = $value - $knob_w * 0.5;	2720	$self->{knob_x} = $value - $knob_w * 0.5;
2249	$self->{knob_w} = $knob_w;	2721	$self->{knob_w} = $knob_w;
2250	});	2722	}
2251
2252	$self->SUPER::update;
2253	}
2254
2255	sub _draw {
2256	my ($self) = @_;
2257		2723
2258	$self->SUPER::_draw ();	2724	$self->SUPER::_draw ();
2259		2725
2260	glScale $self->{w}, $self->{h};	2726	glScale $self->{w}, $self->{h};
2261		2727
…		…
2281	glDisable GL_TEXTURE_2D;	2747	glDisable GL_TEXTURE_2D;
2282	}	2748	}
2283		2749
2284	#############################################################################	2750	#############################################################################
2285		2751
2286	package CFClient::UI::ValSlider;	2752	package CFPlus::UI::ValSlider;
2287		2753
2288	our @ISA = CFClient::UI::HBox::;	2754	our @ISA = CFPlus::UI::HBox::;
2289		2755
2290	sub new {	2756	sub new {
2291	my ($class, %arg) = @_;	2757	my ($class, %arg) = @_;
2292		2758
2293	my $range = delete $arg{range};	2759	my $range = delete $arg{range};
2294		2760
2295	my $self = $class->SUPER::new (	2761	my $self = $class->SUPER::new (
2296	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2762	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2297	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2763	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2298	to_value => sub { shift },	2764	to_value => sub { shift },
2299	from_value => sub { shift },	2765	from_value => sub { shift },
2300	%arg,	2766	%arg,
2301	);	2767	);
2302		2768
…		…
2322	sub set_range { shift->{slider}->set_range (@_) }	2788	sub set_range { shift->{slider}->set_range (@_) }
2323	sub set_value { shift->{slider}->set_value (@_) }	2789	sub set_value { shift->{slider}->set_value (@_) }
2324		2790
2325	#############################################################################	2791	#############################################################################
2326		2792
2327	package CFClient::UI::TextView;	2793	package CFPlus::UI::TextScroller;
2328		2794
2329	our @ISA = CFClient::UI::HBox::;	2795	our @ISA = CFPlus::UI::HBox::;
2330		2796
2331	use CFClient::OpenGL;	2797	use CFPlus::OpenGL;
2332		2798
2333	sub new {	2799	sub new {
2334	my $class = shift;	2800	my $class = shift;
2335		2801
2336	my $self = $class->SUPER::new (	2802	my $self = $class->SUPER::new (
2337	fontsize => 1,	2803	fontsize => 1,
2338	can_events => 0,	2804	can_events => 1,
		2805	indent => 0,
2339	#font => default_font	2806	#font => default_font
2340	@_,	2807	@_,
2341		2808
2342	layout => (new CFClient::Layout 1),	2809	layout => (new CFPlus::Layout),
2343	par => [],	2810	par => [],
2344	height => 0,	2811	height => 0,
2345	children => [	2812	children => [
2346	(new CFClient::UI::Empty expand => 1),	2813	(new CFPlus::UI::Empty expand => 1),
2347	(new CFClient::UI::Slider vertical => 1),	2814	(new CFPlus::UI::Slider vertical => 1),
2348	],	2815	],
2349	);	2816	);
2350		2817
2351	$self->{children}[1]->connect (changed => sub { $self->update });	2818	$self->{children}[1]->connect (changed => sub { $self->update });
2352		2819
…		…
2358		2825
2359	$self->{fontsize} = $fontsize;	2826	$self->{fontsize} = $fontsize;
2360	$self->reflow;	2827	$self->reflow;
2361	}	2828	}
2362		2829
		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
2363	sub size_allocate {	2839	sub invoke_size_allocate {
2364	my ($self, $w, $h) = @_;	2840	my ($self, $w, $h) = @_;
2365		2841
2366	$self->SUPER::size_allocate ($w, $h);	2842	my ($empty, $slider, @other) = @{ $self->{children} };
		2843	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2367		2844
2368	$self->{layout}->set_font ($self->{font}) if $self->{font};	2845	$self->{layout}->set_font ($self->{font}) if $self->{font};
2369	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2846	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2370	$self->{layout}->set_width ($self->{children}[0]{w});	2847	$self->{layout}->set_width ($empty->{w});
		2848	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2371		2849
2372	$self->reflow;	2850	$self->reflow;
2373	}
2374		2851
2375	sub text_size {	2852	local $self->{children} = [$empty, $slider];
		2853	$self->SUPER::invoke_size_allocate ($w, $h)
		2854	}
		2855
		2856	sub invoke_mouse_wheel {
2376	my ($self, $text, $indent) = @_;	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) = @_;
2377		2868
2378	my $layout = $self->{layout};	2869	my $layout = $self->{layout};
2379		2870
		2871	$layout->set_font ($self->{font}) if $self->{font};
		2872	$layout->set_foreground (@{$para->{fg}});
2380	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2873	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2381	$layout->set_width ($self->{children}[0]{w} - $indent);	2874	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2875	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2382	$layout->set_markup ($text);	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}}
2383		2882	);
		2883
2384	$layout->size	2884	$layout
2385	}	2885	}
2386		2886
2387	sub reflow {	2887	sub reflow {
2388	my ($self) = @_;	2888	my ($self) = @_;
2389		2889
…		…
2396		2896
2397	# todo: base offset on lines or so, not on pixels	2897	# todo: base offset on lines or so, not on pixels
2398	$self->{children}[1]->set_value ($offset);	2898	$self->{children}[1]->set_value ($offset);
2399	}	2899	}
2400		2900
		2901	sub current_paragraph {
		2902	my ($self) = @_;
		2903
		2904	$self->{top_paragraph} - 1
		2905	}
		2906
		2907	sub scroll_to {
		2908	my ($self, $para) = @_;
		2909
		2910	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2911
		2912	$self->{scroll_to} = $para;
		2913	$self->update;
		2914	}
		2915
2401	sub clear {	2916	sub clear {
2402	my ($self) = @_;	2917	my ($self) = @_;
		2918
		2919	my (undef, undef, @other) = @{ $self->{children} };
		2920	$self->remove ($_) for @other;
2403		2921
2404	$self->{par} = [];	2922	$self->{par} = [];
2405	$self->{height} = 0;	2923	$self->{height} = 0;
2406	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2924	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2407	}	2925	}
2408		2926
2409	sub add_paragraph {	2927	sub add_paragraph {
2410	my ($self, $color, $text, $indent) = @_;	2928	my $self = shift;
2411		2929
2412	for my $line (split /\n/, $text) {	2930	for my $para (@_) {
2413	my ($w, $h) = $self->text_size ($line);	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	};
		2940
		2941	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2942	push @{$self->{par}}, $para;
		2943	}
		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
2414	$self->{height} += $h;	2978	$self->{height} = $height;
2415	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2979	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2416	}
2417		2980
2418	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2981	delete $self->{texture};
		2982	}
		2983
		2984	if (my $paridx = delete $self->{scroll_to}) {
		2985	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2986	}
2419	}	2987	}
2420		2988
2421	sub update {	2989	sub update {
2422	my ($self) = @_;	2990	my ($self) = @_;
2423		2991
…		…
2425		2993
2426	return unless $self->{h} > 0;	2994	return unless $self->{h} > 0;
2427		2995
2428	delete $self->{texture};	2996	delete $self->{texture};
2429		2997
2430	$ROOT->on_post_alloc ($self, sub {	2998	$ROOT->on_post_alloc ($self => sub {
		2999	$self->force_uptodate;
		3000
2431	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3001	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2432		3002
2433	if (delete $self->{need_reflow}) {
2434	my $height = 0;
2435
2436	my $layout = $self->{layout};
2437
2438	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2439
2440	for (@{$self->{par}}) {
2441	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2442	$layout->set_width ($W - $_->[3]);
2443	$layout->set_markup ($_->[4]);
2444	my ($w, $h) = $layout->size;
2445	$_->[0] = $w + $_->[3];
2446	$_->[1] = $h;
2447	}
2448
2449	$height += $_->[1];
2450	}
2451
2452	$self->{height} = $height;
2453
2454	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2455
2456	delete $self->{texture};
2457	}
2458
2459	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3003	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2460	glClearColor 0.5, 0.5, 0.5, 0;	3004	glClearColor 0, 0, 0, 0;
2461	glClear GL_COLOR_BUFFER_BIT;	3005	glClear GL_COLOR_BUFFER_BIT;
2462		3006
		3007	package CFPlus::UI::Base;
		3008	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3009	(0, 0, $self->{w}, $self->{h});
		3010
		3011	my $top = int $self->{children}[1]{range}[0];
		3012
		3013	my $paridx = 0;
		3014	my $top_paragraph;
2463	my $top = int $self->{children}[1]{range}[0];	3015	my $top = int $self->{children}[1]{range}[0];
2464		3016
2465	my $y0 = $top;	3017	my $y0 = $top;
2466	my $y1 = $top + $H;	3018	my $y1 = $top + $H;
2467		3019
2468	my $y = 0;
2469
2470	my $layout = $self->{layout};
2471
2472	$layout->set_font ($self->{font}) if $self->{font};
2473
2474	glEnable GL_BLEND;
2475	#TODO# not correct in windows where rgba is forced off
2476	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2477
2478	for my $par (@{$self->{par}}) {	3020	for my $para (@{$self->{par}}) {
2479	my $h = $par->[1];	3021	my $h = $para->{h};
		3022	my $y = $para->{y};
2480		3023
2481	if ($y0 < $y + $h && $y < $y1) {	3024	if ($y0 < $y + $h && $y < $y1) {
2482	$layout->set_foreground (@{ $par->[2] });	3025	my $layout = $self->get_layout ($para);
2483	$layout->set_width ($W - $par->[3]);
2484	$layout->set_markup ($par->[4]);
2485		3026
2486	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3027	$layout->render ($para->{indent}, $y - $y0);
2487		3028
2488	glRasterPos $par->[3], $y - $y0;	3029	if (my @w = @{ $para->{widget} }) {
2489	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	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	}
2490	}	3041	}
2491		3042
2492	$y += $h;	3043	$paridx++;
		3044	$top_paragraph ||= $paridx if $y >= $top;
2493	}	3045	}
2494		3046
2495	glDisable GL_BLEND;	3047	$self->{top_paragraph} = $top_paragraph;
2496	};	3048	};
2497	});	3049	});
2498	}	3050	}
2499		3051
		3052	sub reconfigure {
		3053	my ($self) = @_;
		3054
		3055	$self->SUPER::reconfigure;
		3056
		3057	$_->{w} = 1e10 for @{ $self->{par} };
		3058	$self->reflow;
		3059	}
		3060
2500	sub _draw {	3061	sub _draw {
2501	my ($self) = @_;	3062	my ($self) = @_;
2502		3063
2503	glEnable GL_TEXTURE_2D;	3064	glEnable GL_TEXTURE_2D;
2504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3065	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2505	glColor 1, 1, 1, 1;	3066	glColor 0, 0, 0, 1;
2506	$self->{texture}->draw_quad_alpha (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});
2507	glDisable GL_TEXTURE_2D;	3068	glDisable GL_TEXTURE_2D;
2508		3069
2509	$self->{children}[1]->draw;	3070	$self->{children}[1]->draw;
2510
2511	}	3071	}
2512		3072
2513	#############################################################################	3073	#############################################################################
2514		3074
2515	package CFClient::UI::Animator;	3075	package CFPlus::UI::Animator;
2516		3076
2517	use CFClient::OpenGL;	3077	use CFPlus::OpenGL;
2518		3078
2519	our @ISA = CFClient::UI::Bin::;	3079	our @ISA = CFPlus::UI::Bin::;
2520		3080
2521	sub moveto {	3081	sub moveto {
2522	my ($self, $x, $y) = @_;	3082	my ($self, $x, $y) = @_;
2523		3083
2524	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3084	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2552	glPopMatrix;	3112	glPopMatrix;
2553	}	3113	}
2554		3114
2555	#############################################################################	3115	#############################################################################
2556		3116
2557	package CFClient::UI::Flopper;	3117	package CFPlus::UI::Flopper;
2558		3118
2559	our @ISA = CFClient::UI::Button::;	3119	our @ISA = CFPlus::UI::Button::;
2560		3120
2561	sub new {	3121	sub new {
2562	my $class = shift;	3122	my $class = shift;
2563		3123
2564	my $self = $class->SUPER::new (	3124	my $self = $class->SUPER::new (
…		…
2576	$self->{other}->toggle_visibility;	3136	$self->{other}->toggle_visibility;
2577	}	3137	}
2578		3138
2579	#############################################################################	3139	#############################################################################
2580		3140
2581	package CFClient::UI::Tooltip;	3141	package CFPlus::UI::Tooltip;
2582		3142
2583	our @ISA = CFClient::UI::Bin::;	3143	our @ISA = CFPlus::UI::Bin::;
2584		3144
2585	use CFClient::OpenGL;	3145	use CFPlus::OpenGL;
2586		3146
2587	sub new {	3147	sub new {
2588	my $class = shift;	3148	my $class = shift;
2589		3149
2590	$class->SUPER::new (	3150	$class->SUPER::new (
…		…
2594	}	3154	}
2595		3155
2596	sub set_tooltip_from {	3156	sub set_tooltip_from {
2597	my ($self, $widget) = @_;	3157	my ($self, $widget) = @_;
2598		3158
		3159	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3160	if $widget->{tooltip} =~ /^#(.*)$/;
		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
2599	$self->add (new CFClient::UI::Label	3174	$self->add (new CFPlus::UI::Label
2600	markup => $widget->{tooltip},	3175	markup => $tooltip,
2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3176	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602	fontsize => 0.8,	3177	fontsize => 0.8,
2603	fg => [0, 0, 0, 1],	3178	style => 1, # FLAG_INVERSE
2604	ellipsise => 0,	3179	ellipsise => 0,
2605	font => ($widget->{tooltip_font} || $::FONT_PROP),	3180	font => ($widget->{tooltip_font} || $::FONT_PROP),
2606	);	3181	);
2607	}	3182	}
2608		3183
…		…
2612	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3187	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2613		3188
2614	($w + 4, $h + 4)	3189	($w + 4, $h + 4)
2615	}	3190	}
2616		3191
2617	sub size_allocate {	3192	sub invoke_size_allocate {
2618	my ($self, $w, $h) = @_;	3193	my ($self, $w, $h) = @_;
2619		3194
2620	$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	});
2621	}	3218	}
2622		3219
2623	sub _draw {	3220	sub _draw {
2624	my ($self) = @_;	3221	my ($self) = @_;
2625		3222
…		…
2642	glVertex $w, $h;	3239	glVertex $w, $h;
2643	glVertex $w, 0;	3240	glVertex $w, 0;
2644	glEnd;	3241	glEnd;
2645		3242
2646	glTranslate 2 - 0.375, 2 - 0.375;	3243	glTranslate 2 - 0.375, 2 - 0.375;
		3244
2647	$self->SUPER::_draw;	3245	$self->SUPER::_draw;
2648	}	3246	}
2649		3247
2650	#############################################################################	3248	#############################################################################
2651		3249
2652	package CFClient::UI::Face;	3250	package CFPlus::UI::Face;
2653		3251
2654	our @ISA = CFClient::UI::Base::;	3252	our @ISA = CFPlus::UI::DrawBG::;
2655		3253
2656	use CFClient::OpenGL;	3254	use CFPlus::OpenGL;
2657		3255
2658	sub new {	3256	sub new {
2659	my $class = shift;	3257	my $class = shift;
2660		3258
2661	my $self = $class->SUPER::new (	3259	my $self = $class->SUPER::new (
…		…
2696	sub _draw {	3294	sub _draw {
2697	my ($self) = @_;	3295	my ($self) = @_;
2698		3296
2699	return unless $::CONN;	3297	return unless $::CONN;
2700		3298
		3299	$self->SUPER::_draw;
		3300
2701	my $face;	3301	my $face;
2702		3302
2703	if ($self->{frame}) {	3303	if ($self->{frame}) {
2704	my $anim = $::CONN->{anim}[$self->{anim}];	3304	my $anim = $::CONN->{anim}[$self->{anim}];
2705		3305
…		…
2710	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3310	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2711		3311
2712	if ($tex) {	3312	if ($tex) {
2713	glEnable GL_TEXTURE_2D;	3313	glEnable GL_TEXTURE_2D;
2714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3314	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2715	glColor 1, 1, 1, 1;	3315	glColor 0, 0, 0, 1;
2716	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3316	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2717	glDisable GL_TEXTURE_2D;	3317	glDisable GL_TEXTURE_2D;
2718	}	3318	}
2719	}	3319	}
2720		3320
2721	sub DESTROY {	3321	sub destroy {
2722	my ($self) = @_;	3322	my ($self) = @_;
2723		3323
2724	$self->{timer}->cancel	3324	$self->{timer}->cancel
2725	if $self->{timer};	3325	if $self->{timer};
2726		3326
2727	$self->SUPER::DESTROY;	3327	$self->SUPER::destroy;
2728	}	3328	}
2729		3329
2730	#############################################################################	3330	#############################################################################
2731		3331
2732	package CFClient::UI::Inventory;	3332	package CFPlus::UI::Buttonbar;
2733		3333
2734	our @ISA = CFClient::UI::ScrolledWindow::;	3334	our @ISA = CFPlus::UI::HBox::;
2735		3335
2736	sub new {	3336	# TODO: should actually wrap buttons and other goodies.
2737	my $class = shift;
2738		3337
2739	my $self = $class->SUPER::new (
2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2741	@_,
2742	);
2743
2744	$self
2745	}
2746
2747	sub set_items {
2748	my ($self, $items) = @_;
2749
2750	$self->{scrolled}->clear;
2751	return unless $items;
2752
2753	my @items = sort {
2754	($a->{type} <=> $b->{type})
2755	or ($a->{name} cmp $b->{name})
2756	} @$items;
2757
2758	$self->{real_items} = \@items;
2759
2760	my $row = 0;
2761	for my $item (@items) {
2762	CFClient::Item::update_widgets $item;
2763
2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2767
2768	$row++;
2769	}
2770	}
2771
2772	#############################################################################	3338	#############################################################################
2773		3339
2774	package CFClient::UI::Menu;	3340	package CFPlus::UI::Menu;
2775		3341
2776	our @ISA = CFClient::UI::FancyFrame::;	3342	our @ISA = CFPlus::UI::Toplevel::;
2777		3343
2778	use CFClient::OpenGL;	3344	use CFPlus::OpenGL;
2779		3345
2780	sub new {	3346	sub new {
2781	my $class = shift;	3347	my $class = shift;
2782		3348
2783	my $self = $class->SUPER::new (	3349	my $self = $class->SUPER::new (
2784	items => [],	3350	items => [],
2785	z => 100,	3351	z => 100,
2786	@_,	3352	@_,
2787	);	3353	);
2788		3354
2789	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3355	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2790		3356
2791	for my $item (@{ $self->{items} }) {	3357	for my $item (@{ $self->{items} }) {
2792	my ($widget, $cb) = @$item;	3358	my ($widget, $cb, $tooltip) = @$item;
2793		3359
2794	# handle various types of items, only text for now	3360	# handle various types of items, only text for now
2795	if (!ref $widget) {	3361	if (!ref $widget) {
		3362	if ($widget =~ /\t/) {
		3363	my ($left, $right) = split /\t/, $widget, 2;
		3364
2796	$widget = new CFClient::UI::Label	3365	$widget = new CFPlus::UI::HBox
2797	can_hover => 1,	3366	can_hover => 1,
2798	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,
2799	text => $widget;	3379	markup => $widget,
		3380	tooltip => $tooltip;
		3381	}
2800	}	3382	}
2801		3383
2802	$self->{item}{$widget} = $item;	3384	$self->{item}{$widget} = $item;
2803		3385
2804	$self->{vbox}->add ($widget);	3386	$self->{vbox}->add ($widget);
…		…
2809		3391
2810	# popup given the event (must be a mouse button down event currently)	3392	# popup given the event (must be a mouse button down event currently)
2811	sub popup {	3393	sub popup {
2812	my ($self, $ev) = @_;	3394	my ($self, $ev) = @_;
2813		3395
2814	$self->_emit ("popdown");	3396	$self->emit ("popdown");
2815		3397
2816	# maybe save $GRAB? must be careful about events...	3398	# maybe save $GRAB? must be careful about events...
2817	$GRAB = $self;	3399	$GRAB = $self;
2818	$self->{button} = $ev->{button};	3400	$self->{button} = $ev->{button};
2819		3401
2820	$self->show;	3402	$self->show;
2821	$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);
2822	}	3404	}
2823		3405
2824	sub mouse_motion {	3406	sub invoke_mouse_motion {
2825	my ($self, $ev, $x, $y) = @_;	3407	my ($self, $ev, $x, $y) = @_;
2826		3408
2827	# TODO: should use vbox->find_widget or so	3409	# TODO: should use vbox->find_widget or so
2828	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3410	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2829	$self->{hover} = $self->{item}{$HOVER};	3411	$self->{hover} = $self->{item}{$HOVER};
2830	}
2831		3412
		3413	0
		3414	}
		3415
2832	sub button_up {	3416	sub invoke_button_up {
2833	my ($self, $ev, $x, $y) = @_;	3417	my ($self, $ev, $x, $y) = @_;
2834		3418
2835	if ($ev->{button} == $self->{button}) {	3419	if ($ev->{button} == $self->{button}) {
2836	undef $GRAB;	3420	undef $GRAB;
2837	$self->hide;	3421	$self->hide;
2838		3422
2839	$self->_emit ("popdown");	3423	$self->emit ("popdown");
2840	$self->{hover}[1]->() if $self->{hover};	3424	$self->{hover}[1]->() if $self->{hover};
		3425	} else {
		3426	return 0
		3427	}
		3428
2841	}	3429	1
2842	}	3430	}
2843		3431
2844	#############################################################################	3432	#############################################################################
2845		3433
2846	package CFClient::UI::Statusbox;	3434	package CFPlus::UI::Multiplexer;
2847		3435
2848	our @ISA = CFClient::UI::VBox::;	3436	our @ISA = CFPlus::UI::Container::;
2849		3437
2850	sub new {	3438	sub new {
2851	my $class = shift;	3439	my $class = shift;
2852		3440
2853	$class->SUPER::new (	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 {
		3452	my ($self, @widgets) = @_;
		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;
		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}
		3483	}
		3484
		3485	sub size_request {
		3486	my ($self) = @_;
		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 (
2854	fontsize => 0.8,	3620	fontsize => 0.8,
2855	@_,	3621	@_,
2856	)	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
2857	}	3629	}
2858		3630
2859	sub reorder {	3631	sub reorder {
2860	my ($self) = @_;	3632	my ($self) = @_;
2861	my $NOW = time;	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} };
2862		3639
2863	while (my ($k, $v) = each %{ $self->{item} }) {	3640	while (my ($k, $v) = each %{ $self->{item} }) {
2864	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3641	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2865	}	3642	}
2866		3643
…		…
2869	my @items = sort {	3646	my @items = sort {
2870	$a->{pri} <=> $b->{pri}	3647	$a->{pri} <=> $b->{pri}
2871	or $b->{id} <=> $a->{id}	3648	or $b->{id} <=> $a->{id}
2872	} values %{ $self->{item} };	3649	} values %{ $self->{item} };
2873		3650
		3651	$self->{timer}->interval (1);
		3652
2874	my $count = 10 + 1;	3653	my $count = 10 + 1;
2875	for my $item (@items) {	3654	for my $item (@items) {
2876	last unless --$count;	3655	last unless --$count;
2877		3656
2878	push @widgets, $item->{label} ||= do {	3657	my $label = $item->{label} ||= do {
2879	# TODO: doesn't handle markup well (read as: at all)	3658	# TODO: doesn't handle markup well (read as: at all)
2880	my $short = $item->{count} > 1	3659	my $short = $item->{count} > 1
2881	? "<b>$item->{count} ×</b> $item->{text}"	3660	? "<b>$item->{count} ×</b> $item->{text}"
2882	: $item->{text};	3661	: $item->{text};
2883		3662
2884	for ($short) {	3663	for ($short) {
2885	s/^\s+//;	3664	s/^\s+//;
2886	s/\s+/ /g;	3665	s/\s+/ /g;
2887	}	3666	}
2888		3667
2889	new CFClient::UI::Label	3668	new CFPlus::UI::Label
2890	markup => $short,	3669	markup => $short,
2891	tooltip => $item->{tooltip},	3670	tooltip => $item->{tooltip},
2892	tooltip_font => $::FONT_PROP,	3671	tooltip_font => $::FONT_PROP,
2893	tooltip_width => 0.67,	3672	tooltip_width => 0.67,
2894	fontsize => $item->{fontsize} || $self->{fontsize},	3673	fontsize => $item->{fontsize} || $self->{fontsize},
2895	max_w => $::WIDTH * 0.44,	3674	max_w => $::WIDTH * 0.44,
2896	fg => $item->{fg},	3675	fg => [@{ $item->{fg} }],
2897	can_events => 1,	3676	can_events => 1,
2898	can_hover => 1	3677	can_hover => 1
2899	};	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;
2900	}	3691	}
2901		3692
2902	$self->clear;	3693	$self->clear;
2903	$self->SUPER::add (reverse @widgets);	3694	$self->SUPER::add (reverse @widgets);
2904	}	3695	}
…		…
2909	$text =~ s/^\s+//;	3700	$text =~ s/^\s+//;
2910	$text =~ s/\s+$//;	3701	$text =~ s/\s+$//;
2911		3702
2912	return unless $text;	3703	return unless $text;
2913		3704
2914	my $timeout = time + ((delete $arg{timeout}) || 60);	3705	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2915		3706
2916	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3707	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2917		3708
2918	if (my $item = $self->{item}{$group}) {	3709	if (my $item = $self->{item}{$group}) {
2919	if ($item->{text} eq $text) {	3710	if ($item->{text} eq $text) {
2920	$item->{count}++;	3711	$item->{count}++;
2921	} else {	3712	} else {
2922	$item->{count} = 1;	3713	$item->{count} = 1;
2923	$item->{text} = $item->{tooltip} = $text;	3714	$item->{text} = $item->{tooltip} = $text;
2924	}	3715	}
2925	$item->{id} = ++$self->{id};	3716	$item->{id} += 0.2;#d#
2926	$item->{timeout} = $timeout;	3717	$item->{timeout} = $timeout;
2927	delete $item->{label};	3718	delete $item->{label};
2928	} else {	3719	} else {
2929	$self->{item}{$group} = {	3720	$self->{item}{$group} = {
2930	id => ++$self->{id},	3721	id => ++$self->{id},
…		…
2936	count => 1,	3727	count => 1,
2937	%arg,	3728	%arg,
2938	};	3729	};
2939	}	3730	}
2940		3731
		3732	$ROOT->on_refresh (reorder => sub {
2941	$self->reorder;	3733	$self->reorder;
		3734	});
2942	}	3735	}
2943		3736
2944	sub reconfigure {	3737	sub reconfigure {
2945	my ($self) = @_;	3738	my ($self) = @_;
2946		3739
…		…
2949		3742
2950	$self->reorder;	3743	$self->reorder;
2951	$self->SUPER::reconfigure;	3744	$self->SUPER::reconfigure;
2952	}	3745	}
2953		3746
2954	#############################################################################	3747	sub destroy {
		3748	my ($self) = @_;
2955		3749
2956	package CFClient::UI::Root;	3750	$self->{timer}->cancel;
2957		3751
2958	our @ISA = CFClient::UI::Container::;	3752	$self->SUPER::destroy;
		3753	}
2959		3754
2960	use CFClient::OpenGL;	3755	#############################################################################
		3756
		3757	package CFPlus::UI::Inventory;
		3758
		3759	our @ISA = CFPlus::UI::Table::;
2961		3760
2962	sub new {	3761	sub new {
2963	my $class = shift;	3762	my $class = shift;
2964		3763
2965	$class->SUPER::new (	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 (
2966	visible => 1,	3954	visible => 1,
2967	@_,	3955	@_,
2968	)	3956	);
2969	}
2970		3957
2971	sub configure {	3958	Scalar::Util::weaken ($self->{root} = $self);
2972	my ($self, $x, $y, $w, $h) = @_;
2973		3959
2974	$self->{w} = $w;	3960	$self
2975	$self->{h} = $h;
2976	}
2977
2978	sub check_size {
2979	my ($self) = @_;
2980
2981	$self->size_allocate ($self->{w}, $self->{h})
2982	if $self->{w};
2983	}	3961	}
2984		3962
2985	sub size_request {	3963	sub size_request {
2986	my ($self) = @_;	3964	my ($self) = @_;
2987		3965
2988	($self->{w}, $self->{h})	3966	($self->{w}, $self->{h})
2989	}	3967	}
2990		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
2991	sub size_allocate {	3983	sub invoke_size_allocate {
2992	my ($self, $w, $h) = @_;	3984	my ($self, $w, $h) = @_;
2993		3985
2994	for my $child ($self->children) {	3986	for my $child ($self->children) {
2995	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)};
2996		3988
2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3989	$X = $child->{force_x} if exists $child->{force_x};
2998	if exists $child->{req_x};	3990	$Y = $child->{force_y} if exists $child->{force_y};
2999		3991
3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3992	$X = _to_pixel $X, $W, $self->{w};
3001	if exists $child->{req_y};	3993	$Y = _to_pixel $Y, $H, $self->{h};
3002
3003	delete @$child{qw(req_x req_y)};
3004
3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007		3994
3008	$child->configure ($X, $Y, $W, $H);	3995	$child->configure ($X, $Y, $W, $H);
3009	}	3996	}
		3997
		3998	1
3010	}	3999	}
3011		4000
3012	sub coord2local {	4001	sub coord2local {
3013	my ($self, $x, $y) = @_;	4002	my ($self, $x, $y) = @_;
3014		4003
…		…
3022	}	4011	}
3023		4012
3024	sub update {	4013	sub update {
3025	my ($self) = @_;	4014	my ($self) = @_;
3026		4015
3027	$self->check_size;
3028	$::WANT_REFRESH++;	4016	$::WANT_REFRESH++;
3029	}	4017	}
3030		4018
3031	sub add {	4019	sub add {
3032	my ($self, @children) = @_;	4020	my ($self, @children) = @_;
3033		4021
3034	for my $child (@children) {
3035	$child->{is_toplevel} = 1;	4022	$_->{is_toplevel} = 1
3036		4023	for @children;
3037	# integerise window positions
3038	$child->{x} = int $child->{x};
3039	$child->{y} = int $child->{y};
3040	}
3041		4024
3042	$self->SUPER::add (@children);	4025	$self->SUPER::add (@children);
3043
3044	for (my @widgets = @children; my $w = pop @widgets; ) {
3045	push @widgets, $w->children;
3046	$w->set_visible;
3047	}
3048
3049	}	4026	}
3050		4027
3051	sub remove {	4028	sub remove {
3052	my ($self, @children) = @_;	4029	my ($self, @children) = @_;
3053		4030
3054	$self->SUPER::remove (@children);	4031	$self->SUPER::remove (@children);
		4032
		4033	delete $self->{is_toplevel}
		4034	for @children;
3055		4035
3056	while (@children) {	4036	while (@children) {
3057	my $w = pop @children;	4037	my $w = pop @children;
3058	push @children, $w->children;	4038	push @children, $w->children;
3059	$w->set_invisible;	4039	$w->set_invisible;
…		…
3078	while ($self->{refresh_hook}) {	4058	while ($self->{refresh_hook}) {
3079	$_->()	4059	$_->()
3080	for values %{delete $self->{refresh_hook}};	4060	for values %{delete $self->{refresh_hook}};
3081	}	4061	}
3082		4062
3083	if ($self->{check_size}) {	4063	if ($self->{realloc}) {
		4064	my %queue;
3084	my @queue;	4065	my @queue;
		4066	my $widget;
3085		4067
3086	for (;;) {	4068	outer:
3087	if ($self->{check_size}) {	4069	while () {
3088	#TODO use array-of-depth approach	4070	if (my $realloc = delete $self->{realloc}) {
		4071	for $widget (values %$realloc) {
		4072	$widget->{visible} or next; # do not resize invisible widgets
3089		4073
3090	@queue = sort { $a->{visible} <=> $b->{visible} }	4074	$queue{$widget+0}++ and next; # duplicates are common
3091	@queue, values %{delete $self->{check_size}};	4075
		4076	push @{ $queue[$widget->{visible}] }, $widget;
		4077	}
3092	}	4078	}
3093		4079
		4080	while () {
		4081	@queue or last outer;
		4082
3094	my $widget = pop @queue || last;	4083	$widget = pop @{ $queue[-1] || [] }
3095		4084	and last;
3096	defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099	? @$widget{qw(def_w def_h)}
3100	: $widget->size_request;
3101
3102	if (delete $widget->{force_alloc}
3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105		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}) {
3106	$widget->{req_w} = $w;	4104	$widget->{req_w} = $w;
3107	$widget->{req_h} = $h;	4105	$widget->{req_h} = $h;
3108		4106
3109	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	4107	$self->{size_alloc}{$widget+0} = $widget;
3110		4108
3111	$widget->{parent}->check_size
3112	if $widget->{parent};	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	}
3113	}	4116	}
		4117
		4118	delete $self->{realloc}{$widget+0};
3114	}	4119	}
3115	}	4120	}
3116		4121
3117	while ($self->{size_alloc}) {	4122	while (my $size_alloc = delete $self->{size_alloc}) {
3118	for (values %{delete $self->{size_alloc}}) {	4123	my @queue = sort { $b->{visible} <=> $a->{visible} }
3119	my ($widget, $w, $h) = @$_;	4124	values %$size_alloc;
		4125
		4126	while () {
		4127	my $widget = pop @queue || last;
		4128
		4129	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120		4130
3121	$w = 0 if $w < 0;	4131	$w = 0 if $w < 0;
3122	$h = 0 if $h < 0;	4132	$h = 0 if $h < 0;
3123		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
3124	$widget->{w} = $w;	4150	$widget->{w} = $w;
3125	$widget->{h} = $h;	4151	$widget->{h} = $h;
		4152
3126	$widget->emit (size_allocate => $w, $h);	4153	$widget->emit (size_allocate => $w, $h);
		4154	}
3127	}	4155	}
3128	}	4156	}
3129		4157
3130	while ($self->{post_alloc_hook}) {	4158	while ($self->{post_alloc_hook}) {
3131	$_->()	4159	$_->()
3132	for values %{delete $self->{post_alloc_hook}};	4160	for values %{delete $self->{post_alloc_hook}};
3133	}	4161	}
		4162
3134		4163
3135	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4164	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4165	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137	glClear GL_COLOR_BUFFER_BIT;	4166	glClear GL_COLOR_BUFFER_BIT;
3138		4167
…		…
3140	glLoadIdentity;	4169	glLoadIdentity;
3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4170	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142	glMatrixMode GL_MODELVIEW;	4171	glMatrixMode GL_MODELVIEW;
3143	glLoadIdentity;	4172	glLoadIdentity;
3144		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
3145	$self->_draw;	4180	$self->_draw;
		4181	}
3146	}	4182	}
3147		4183
3148	#############################################################################	4184	#############################################################################
3149		4185
3150	package CFClient::UI;	4186	package CFPlus::UI;
3151		4187
3152	$ROOT = new CFClient::UI::Root;	4188	$ROOT = new CFPlus::UI::Root;
3153	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4189	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3154		4190
3155	1	4191	1
3156		4192

Diff Legend

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