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

Diff Legend

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