ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.249 by root, Sun May 28 01:40:02 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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