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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.381 by root, Thu Jul 19 13:45:18 2007 UTC

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

Diff Legend

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