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

Diff Legend

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