ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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