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

Diff Legend

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