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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 2006 UTC

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

Diff Legend

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