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

Diff Legend

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