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

Diff Legend

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