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.373 by root, Sun Jul 15 22:39:30 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	scroll_x => 0,
		1067	scroll_y => 1,
		1068	can_events => 1,
923	slider => $slider,	1069	hslider => $hslider,
924	@_,	1070	vslider => $vslider,
		1071	col_expand => [1, 0],
		1072	row_expand => [1, 0],
		1073	%arg,
925	);	1074	);
926		1075
927	$self->{vp}->add ($self->{scrolled});	1076	$self->{vp} = new CFPlus::UI::ViewPort
		1077	expand => 1,
		1078	scroll_x => $self->{scroll_x},
		1079	scroll_y => $self->{scroll_y},
		1080	;
		1081
928	$self->add ($self->{vp});	1082	$self->SUPER::add (0, 0, $self->{vp});
929	$self->add ($self->{slider});	1083	$self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
		1084	$self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
		1085
		1086	$self->add ($child) if $child;
930		1087
931	$self	1088	$self
932	}	1089	}
933		1090
		1091	#TODO# update range on size_allocate depending on child
		1092
		1093	sub add {
		1094	my ($self, $widget) = @_;
		1095
		1096	$self->{vp}->add ($self->{child} = $widget);
		1097	}
		1098
		1099	sub invoke_mouse_wheel {
		1100	my ($self, $ev) = @_;
		1101
		1102	return 0 unless $ev->{dy}; # only vertical movements
		1103
		1104	$self->{vslider}->emit (mouse_wheel => $ev);
		1105
		1106	1
		1107	}
		1108
		1109	sub update_slider {
		1110	my ($self) = @_;
		1111
		1112	my $child = ($self->{vp} or return)->child;
		1113
		1114	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1115	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1116	#$self->{hslider}->set_visibility ($w1 != $w2);
		1117
		1118	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1120	#$self->{vslider}->set_visibility ($h1 != $h2);
		1121	}
		1122
934	sub update {	1123	sub update {
935	my ($self) = @_;	1124	my ($self) = @_;
936		1125
937	$self->SUPER::update;	1126	$self->SUPER::update;
938		1127	$self->update_slider;
939	# todo: overwrite size_allocate of child
940	my $child = $self->{vp}->child;
941	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
942	}	1128	}
943		1129
944	sub size_allocate {	1130	sub invoke_size_allocate {
945	my ($self, $w, $h) = @_;	1131	my ($self, $w, $h) = @_;
946		1132
		1133	$self->update_slider;
947	$self->SUPER::size_allocate ($w, $h);	1134	$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	}	1135	}
952
953	#TODO# update range on size_allocate depending on child
954	# update viewport offset on scroll
955		1136
956	#############################################################################	1137	#############################################################################
957		1138
958	package CFClient::UI::Frame;	1139	package CFPlus::UI::Frame;
959		1140
960	our @ISA = CFClient::UI::Bin::;	1141	our @ISA = CFPlus::UI::Bin::;
961		1142
962	use CFClient::OpenGL;	1143	use CFPlus::OpenGL;
963		1144
964	sub new {	1145	sub new {
965	my $class = shift;	1146	my $class = shift;
966		1147
967	$class->SUPER::new (	1148	$class->SUPER::new (
…		…
975		1156
976	if ($self->{bg}) {	1157	if ($self->{bg}) {
977	my ($w, $h) = @$self{qw(w h)};	1158	my ($w, $h) = @$self{qw(w h)};
978		1159
979	glEnable GL_BLEND;	1160	glEnable GL_BLEND;
980	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1161	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
981	glColor @{ $self->{bg} };	1162	glColor_premultiply @{ $self->{bg} };
982		1163
983	glBegin GL_QUADS;	1164	glBegin GL_QUADS;
984	glVertex 0 , 0;	1165	glVertex 0 , 0;
985	glVertex 0 , $h;	1166	glVertex 0 , $h;
986	glVertex $w, $h;	1167	glVertex $w, $h;
…		…
993	$self->SUPER::_draw;	1174	$self->SUPER::_draw;
994	}	1175	}
995		1176
996	#############################################################################	1177	#############################################################################
997		1178
998	package CFClient::UI::FancyFrame;	1179	package CFPlus::UI::FancyFrame;
999		1180
1000	our @ISA = CFClient::UI::Bin::;	1181	our @ISA = CFPlus::UI::Bin::;
1001		1182
1002	use CFClient::OpenGL;	1183	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		1184
1008	sub new {	1185	sub new {
1009	my $class = shift;	1186	my ($class, %arg) = @_;
		1187
		1188	if ((exists $arg{label}) && !ref $arg{label}) {
		1189	$arg{label} = new CFPlus::UI::Label
		1190	align => 1,
		1191	valign => 0,
		1192	text => $arg{label},
		1193	fontsize => ($arg{border} || 0.8) * 0.75;
		1194	}
		1195
		1196	my $self = $class->SUPER::new (
		1197	# label => "",
		1198	fg => [0.6, 0.3, 0.1],
		1199	border => 0.8,
		1200	style => 'single',
		1201	%arg,
		1202	);
		1203
		1204	$self
		1205	}
		1206
		1207	sub add {
		1208	my ($self, @widgets) = @_;
		1209
		1210	$self->SUPER::add (@widgets);
		1211	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1212	}
		1213
		1214	sub border {
		1215	int $_[0]{border} * $::FONTSIZE
		1216	}
		1217
		1218	sub size_request {
		1219	my ($self) = @_;
		1220
		1221	($self->{label_w}, undef) = $self->{label}->size_request
		1222	if $self->{label};
		1223
		1224	my ($w, $h) = $self->SUPER::size_request;
		1225
		1226	(
		1227	$w + $self->border * 2,
		1228	$h + $self->border * 2,
		1229	)
		1230	}
		1231
		1232	sub invoke_size_allocate {
		1233	my ($self, $w, $h) = @_;
		1234
		1235	my $border = $self->border;
		1236
		1237	$w -= List::Util::max 0, $border * 2;
		1238	$h -= List::Util::max 0, $border * 2;
		1239
		1240	if (my $label = $self->{label}) {
		1241	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1242	$label->{h} = List::Util::min $h, $border;
		1243	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1244	}
		1245
		1246	$self->child->configure ($border, $border, $w, $h);
		1247
		1248	1
		1249	}
		1250
		1251	sub _draw {
		1252	my ($self) = @_;
		1253
		1254	my $child = $self->{children}[0];
		1255
		1256	my $border = $self->border;
		1257	my ($w, $h) = ($self->{w}, $self->{h});
		1258
		1259	$child->draw;
		1260
		1261	glColor @{$self->{fg}};
		1262	glBegin GL_LINE_STRIP;
		1263	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1264	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1265	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1266	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1267	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1268	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1269	glEnd;
		1270
		1271	if ($self->{label}) {
		1272	glTranslate $border * 2, 0;
		1273	$self->{label}->_draw;
		1274	}
		1275	}
		1276
		1277	#############################################################################
		1278
		1279	package CFPlus::UI::Toplevel;
		1280
		1281	our @ISA = CFPlus::UI::Bin::;
		1282
		1283	use CFPlus::OpenGL;
		1284
		1285	my $bg =
		1286	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1287	mipmap => 1, wrap => 1;
		1288
		1289	my @border =
		1290	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1291	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1292
		1293	sub new {
		1294	my ($class, %arg) = @_;
1010		1295
1011	my $self = $class->SUPER::new (	1296	my $self = $class->SUPER::new (
1012	bg => [1, 1, 1, 1],	1297	bg => [1, 1, 1, 1],
1013	border_bg => [1, 1, 1, 1],	1298	border_bg => [1, 1, 1, 1],
1014	border => 0.6,	1299	border => 0.6,
1015	is_toplevel => 1,
1016	can_events => 1,	1300	can_events => 1,
1017	@_	1301	min_w => 64,
		1302	min_h => 32,
		1303	%arg,
1018	);	1304	);
1019		1305
1020	$self->{title} &&= new CFClient::UI::Label	1306	$self->{title_widget} = new CFPlus::UI::Label
1021	align => 0,	1307	align => 0,
1022	valign => 1,	1308	valign => 1,
1023	text => $self->{title},	1309	text => $self->{title},
1024	fontsize => $self->{border};	1310	fontsize => $self->{border},
		1311	if exists $self->{title};
		1312
		1313	if ($self->{has_close_button}) {
		1314	$self->{close_button} =
		1315	new CFPlus::UI::ImageButton
		1316	path => 'x1_close.png',
		1317	on_activate => sub { $self->emit ("delete") };
		1318
		1319	$self->CFPlus::UI::Container::add ($self->{close_button});
		1320	}
1025		1321
1026	$self	1322	$self
		1323	}
		1324
		1325	sub add {
		1326	my ($self, @widgets) = @_;
		1327
		1328	$self->SUPER::add (@widgets);
		1329	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1330	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1027	}	1331	}
1028		1332
1029	sub border {	1333	sub border {
1030	int $_[0]{border} * $::FONTSIZE	1334	int $_[0]{border} * $::FONTSIZE
1031	}	1335	}
1032		1336
1033	sub size_request {	1337	sub size_request {
1034	my ($self) = @_;	1338	my ($self) = @_;
		1339
		1340	$self->{title_widget}->size_request
		1341	if $self->{title_widget};
		1342
		1343	$self->{close_button}->size_request
		1344	if $self->{close_button};
1035		1345
1036	my ($w, $h) = $self->SUPER::size_request;	1346	my ($w, $h) = $self->SUPER::size_request;
1037		1347
1038	(	1348	(
1039	$w + $self->border * 2,	1349	$w + $self->border * 2,
1040	$h + $self->border * 2,	1350	$h + $self->border * 2,
1041	)	1351	)
1042	}	1352	}
1043		1353
1044	sub size_allocate {	1354	sub invoke_size_allocate {
1045	my ($self, $w, $h) = @_;	1355	my ($self, $w, $h) = @_;
1046		1356
		1357	if ($self->{title_widget}) {
		1358	$self->{title_widget}{w} = $w;
		1359	$self->{title_widget}{h} = $h;
		1360	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1361	}
		1362
		1363	my $border = $self->border;
		1364
1047	$h -= List::Util::max 0, $self->border * 2;	1365	$h -= List::Util::max 0, $border * 2;
1048	$w -= List::Util::max 0, $self->border * 2;	1366	$w -= List::Util::max 0, $border * 2;
1049		1367
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);	1368	$self->child->configure ($border, $border, $w, $h);
1054	}
1055		1369
		1370	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1371	if $self->{close_button};
		1372
		1373	1
		1374	}
		1375
		1376	sub invoke_delete {
		1377	my ($self) = @_;
		1378
		1379	$self->hide;
		1380
		1381	1
		1382	}
		1383
1056	sub button_down {	1384	sub invoke_button_down {
1057	my ($self, $ev, $x, $y) = @_;	1385	my ($self, $ev, $x, $y) = @_;
1058		1386
1059	my ($w, $h) = @$self{qw(w h)};	1387	my ($w, $h) = @$self{qw(w h)};
1060	my $border = $self->border;	1388	my $border = $self->border;
1061		1389
…		…
1074	my ($ev, $x, $y) = @_;	1402	my ($ev, $x, $y) = @_;
1075		1403
1076	my $dx = $ev->{x} - $ox;	1404	my $dx = $ev->{x} - $ox;
1077	my $dy = $ev->{y} - $oy;	1405	my $dy = $ev->{y} - $oy;
1078		1406
1079	$self->{user_x} = $wx + $dx * $mx;
1080	$self->{user_y} = $wy + $dy * $my;
1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1407	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1408	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083	$self->move ($self->{user_x}, $self->{user_y});	1409
1084	$self->check_size;	1410	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
		1411	$self->realloc;
1085	};	1412	};
1086		1413
1087	} elsif ($lr ^ $td) {	1414	} elsif ($lr ^ $td) {
1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1415	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089	my ($bx, $by) = ($self->{x}, $self->{y});	1416	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1091	$self->{motion} = sub {	1418	$self->{motion} = sub {
1092	my ($ev, $x, $y) = @_;	1419	my ($ev, $x, $y) = @_;
1093		1420
1094	($x, $y) = ($ev->{x}, $ev->{y});	1421	($x, $y) = ($ev->{x}, $ev->{y});
1095		1422
1096	$self->{user_x} = $bx + $x - $ox;	1423	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097	$self->{user_y} = $by + $y - $oy;	1424	# HACK: the next line is required to enforce placement
1098		1425	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099	$self->move ($self->{user_x}, $self->{user_y});
1100	$self->update;
1101	};	1426	};
		1427	} else {
		1428	return 0;
		1429	}
		1430
1102	}	1431	1
1103	}	1432	}
1104		1433
1105	sub button_up {	1434	sub invoke_button_up {
1106	my ($self, $ev, $x, $y) = @_;	1435	my ($self, $ev, $x, $y) = @_;
1107		1436
1108	delete $self->{motion};	1437	! ! delete $self->{motion}
1109	}	1438	}
1110		1439
1111	sub mouse_motion {	1440	sub invoke_mouse_motion {
1112	my ($self, $ev, $x, $y) = @_;	1441	my ($self, $ev, $x, $y) = @_;
1113		1442
1114	$self->{motion}->($ev, $x, $y) if $self->{motion};	1443	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1444
		1445	! ! $self->{motion}
		1446	}
		1447
		1448	sub invoke_visibility_change {
		1449	my ($self, $visible) = @_;
		1450
		1451	delete $self->{motion} unless $visible;
		1452
		1453	0
1115	}	1454	}
1116		1455
1117	sub _draw {	1456	sub _draw {
1118	my ($self) = @_;	1457	my ($self) = @_;
1119		1458
		1459	my $child = $self->{children}[0];
		1460
1120	my ($w, $h ) = ($self->{w}, $self->{h});	1461	my ($w, $h ) = ($self->{w}, $self->{h});
1121	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1462	my ($cw, $ch) = ($child->{w}, $child->{h});
1122		1463
1123	glEnable GL_TEXTURE_2D;	1464	glEnable GL_TEXTURE_2D;
1124	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1465	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125		1466
1126	my $border = $self->border;	1467	my $border = $self->border;
1127		1468
1128	glColor @{ $self->{border_bg} };	1469	glColor @{ $self->{border_bg} };
1129	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1470	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1130	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1471	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1472	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1473	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133		1474
1134	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1475	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135	my $bg = $tex[0];	1476	glColor @{ $self->{bg} };
1136		1477
1137	# TODO: repeat texture not scale	1478	# TODO: repeat texture not scale
		1479	# solve this better(?)
1138	my $rep_x = $cw / $bg->{w};	1480	$bg->{s} = $cw / $bg->{w};
1139	my $rep_y = $ch / $bg->{h};	1481	$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);	1482	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147	}	1483	}
1148		1484
1149	glDisable GL_TEXTURE_2D;	1485	glDisable GL_TEXTURE_2D;
1150		1486
1151	$self->{title}->draw if $self->{title};
1152
1153	$self->child->draw;	1487	$child->draw;
		1488
		1489	if ($self->{title_widget}) {
		1490	glTranslate 0, $border - $self->{h};
		1491	$self->{title_widget}->_draw;
		1492
		1493	glTranslate 0, - ($border - $self->{h});
		1494	}
		1495
		1496	$self->{close_button}->draw
		1497	if $self->{close_button};
1154	}	1498	}
1155		1499
1156	#############################################################################	1500	#############################################################################
1157		1501
1158	package CFClient::UI::Table;	1502	package CFPlus::UI::Table;
1159		1503
1160	our @ISA = CFClient::UI::Base::;	1504	our @ISA = CFPlus::UI::Base::;
1161		1505
1162	use List::Util qw(max sum);	1506	use List::Util qw(max sum);
1163		1507
1164	use CFClient::OpenGL;	1508	use CFPlus::OpenGL;
1165		1509
1166	sub new {	1510	sub new {
1167	my $class = shift;	1511	my $class = shift;
1168		1512
1169	$class->SUPER::new (	1513	$class->SUPER::new (
1170	col_expand => [],	1514	col_expand => [],
		1515	row_expand => [],
1171	@_,	1516	@_,
1172	)	1517	)
1173	}	1518	}
1174		1519
1175	sub children {	1520	sub children {
1176	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1521	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1177	}	1522	}
1178		1523
1179	sub add {	1524	sub add {
1180	my ($self, $x, $y, $child) = @_;	1525	my ($self) = shift;
1181		1526
		1527	while (@_) {
		1528	my ($x, $y, $child) = splice @_, 0, 3, ();
1182	$child->set_parent ($self);	1529	$child->set_parent ($self);
1183	$self->{children}[$y][$x] = $child;	1530	$self->{children}[$y][$x] = $child;
		1531	}
1184		1532
1185	$self->check_size (1);	1533	$self->{force_realloc} = 1;
		1534	$self->{force_size_alloc} = 1;
		1535	$self->realloc;
		1536	}
		1537
		1538	sub remove {
		1539	my ($self, $child) = @_;
		1540
		1541	# TODO: not yet implemented
1186	}	1542	}
1187		1543
1188	# TODO: move to container class maybe? send children a signal on removal?	1544	# TODO: move to container class maybe? send children a signal on removal?
1189	sub clear {	1545	sub clear {
1190	my ($self) = @_;	1546	my ($self) = @_;
…		…
1195	for (@children) {	1551	for (@children) {
1196	delete $_->{parent};	1552	delete $_->{parent};
1197	$_->hide;	1553	$_->hide;
1198	}	1554	}
1199		1555
1200	$self->check_size (1);	1556	$self->realloc;
1201	$self->update;
1202	}	1557	}
1203		1558
1204	sub get_wh {	1559	sub get_wh {
1205	my ($self) = @_;	1560	my ($self) = @_;
1206		1561
…		…
1232	(sum @$ws),	1587	(sum @$ws),
1233	(sum @$hs),	1588	(sum @$hs),
1234	)	1589	)
1235	}	1590	}
1236		1591
1237	sub size_allocate {	1592	sub invoke_size_allocate {
1238	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1239		1594
1240	my ($ws, $hs) = $self->get_wh;	1595	my ($ws, $hs) = $self->get_wh;
1241		1596
1242	my $req_w = (sum @$ws) || 1;	1597	my $req_w = (sum @$ws) || 1;
1243	my $req_h = (sum @$hs) || 1;	1598	my $req_h = (sum @$hs) || 1;
1244		1599
1245	# TODO: nicer code && do row_expand	1600	# TODO: nicer code
1246	my @col_expand = @{$self->{col_expand}};	1601	my @col_expand = @{$self->{col_expand}};
1247	@col_expand = (1) x @$ws unless @col_expand;	1602	@col_expand = (1) x @$ws unless @col_expand;
1248	my $col_expand = (sum @col_expand) || 1;	1603	my $col_expand = (sum @col_expand) || 1;
1249		1604
1250	# linearly scale sizes
1251	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1605	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1252	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1253		1606
1254	CFClient::UI::harmonize $ws;	1607	CFPlus::UI::harmonize $ws;
		1608
		1609	my @row_expand = @{$self->{row_expand}};
		1610	@row_expand = (1) x @$ws unless @row_expand;
		1611	my $row_expand = (sum @row_expand) || 1;
		1612
		1613	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1614
1255	CFClient::UI::harmonize $hs;	1615	CFPlus::UI::harmonize $hs;
1256		1616
1257	my $y;	1617	my $y;
1258		1618
1259	for my $r (0 .. $#{$self->{children}}) {	1619	for my $r (0 .. $#{$self->{children}}) {
1260	my $row = $self->{children}[$r]	1620	my $row = $self->{children}[$r]
…		…
1274	}	1634	}
1275		1635
1276	$y += $row_h;	1636	$y += $row_h;
1277	}	1637	}
1278		1638
		1639	1
1279	}	1640	}
1280		1641
1281	sub find_widget {	1642	sub find_widget {
1282	my ($self, $x, $y) = @_;	1643	my ($self, $x, $y) = @_;
1283		1644
…		…
1302	}	1663	}
1303	}	1664	}
1304		1665
1305	#############################################################################	1666	#############################################################################
1306		1667
1307	package CFClient::UI::Box;	1668	package CFPlus::UI::Box;
1308		1669
1309	our @ISA = CFClient::UI::Container::;	1670	our @ISA = CFPlus::UI::Container::;
1310		1671
1311	sub size_request {	1672	sub size_request {
1312	my ($self) = @_;	1673	my ($self) = @_;
1313		1674
1314	$self->{vertical}	1675	$self->{vertical}
…		…
1320	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1681	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1321	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1682	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1322	)	1683	)
1323	}	1684	}
1324		1685
1325	sub size_allocate {	1686	sub invoke_size_allocate {
1326	my ($self, $w, $h) = @_;	1687	my ($self, $w, $h) = @_;
1327		1688
1328	my $space = $self->{vertical} ? $h : $w;	1689	my $space = $self->{vertical} ? $h : $w;
1329	my $children = $self->{children};	1690	my @children = $self->visible_children;
1330		1691
1331	my @req;	1692	my @req;
1332		1693
1333	if ($self->{homogeneous}) {	1694	if ($self->{homogeneous}) {
1334	@req = ($space / (@$children || 1)) x @$children;	1695	@req = ($space / (@children || 1)) x @children;
1335	} else {	1696	} else {
1336	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1697	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1337	my $req = List::Util::sum @req;	1698	my $req = List::Util::sum @req;
1338		1699
1339	if ($req > $space) {	1700	if ($req > $space) {
1340	# ah well, not enough space	1701	# ah well, not enough space
1341	$_ *= $space / $req for @req;	1702	$_ *= $space / $req for @req;
1342	} else {	1703	} else {
1343	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1704	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1344		1705
1345	$space = ($space - $req) / $expand; # remaining space to give away	1706	$space = ($space - $req) / $expand; # remaining space to give away
1346		1707
1347	$req[$_] += $space * $children->[$_]{expand}	1708	$req[$_] += $space * $children[$_]{expand}
1348	for 0 .. $#$children;	1709	for 0 .. $#children;
1349	}	1710	}
1350	}	1711	}
1351		1712
1352	CFClient::UI::harmonize \@req;	1713	CFPlus::UI::harmonize \@req;
1353		1714
1354	my $pos = 0;	1715	my $pos = 0;
1355	for (0 .. $#$children) {	1716	for (0 .. $#children) {
1356	my $alloc = $req[$_];	1717	my $alloc = $req[$_];
1357	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1718	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1358		1719
1359	$pos += $alloc;	1720	$pos += $alloc;
1360	}	1721	}
1361		1722
1362	1	1723	1
1363	}	1724	}
1364		1725
1365	#############################################################################	1726	#############################################################################
1366		1727
1367	package CFClient::UI::HBox;	1728	package CFPlus::UI::HBox;
1368		1729
1369	our @ISA = CFClient::UI::Box::;	1730	our @ISA = CFPlus::UI::Box::;
1370		1731
1371	sub new {	1732	sub new {
1372	my $class = shift;	1733	my $class = shift;
1373		1734
1374	$class->SUPER::new (	1735	$class->SUPER::new (
…		…
1377	)	1738	)
1378	}	1739	}
1379		1740
1380	#############################################################################	1741	#############################################################################
1381		1742
1382	package CFClient::UI::VBox;	1743	package CFPlus::UI::VBox;
1383		1744
1384	our @ISA = CFClient::UI::Box::;	1745	our @ISA = CFPlus::UI::Box::;
1385		1746
1386	sub new {	1747	sub new {
1387	my $class = shift;	1748	my $class = shift;
1388		1749
1389	$class->SUPER::new (	1750	$class->SUPER::new (
…		…
1392	)	1753	)
1393	}	1754	}
1394		1755
1395	#############################################################################	1756	#############################################################################
1396		1757
1397	package CFClient::UI::Label;	1758	package CFPlus::UI::Label;
1398		1759
1399	our @ISA = CFClient::UI::DrawBG::;	1760	our @ISA = CFPlus::UI::DrawBG::;
1400		1761
1401	use CFClient::OpenGL;	1762	use CFPlus::OpenGL;
1402		1763
1403	sub new {	1764	sub new {
1404	my ($class, %arg) = @_;	1765	my ($class, %arg) = @_;
1405		1766
1406	my $self = $class->SUPER::new (	1767	my $self = $class->SUPER::new (
…		…
1409	#active_bg => none	1770	#active_bg => none
1410	#font => default_font	1771	#font => default_font
1411	#text => initial text	1772	#text => initial text
1412	#markup => initial narkup	1773	#markup => initial narkup
1413	#max_w => maximum pixel width	1774	#max_w => maximum pixel width
		1775	#style => 0, # render flags
1414	ellipsise => 3, # end	1776	ellipsise => 3, # end
1415	layout => (new CFClient::Layout),	1777	layout => (new CFPlus::Layout),
1416	fontsize => 1,	1778	fontsize => 1,
1417	align => -1,	1779	align => -1,
1418	valign => -1,	1780	valign => -1,
1419	padding => 2,	1781	padding_x => 2,
		1782	padding_y => 2,
1420	can_events => 0,	1783	can_events => 0,
1421	%arg	1784	%arg
1422	);	1785	);
1423		1786
1424	if (exists $self->{template}) {	1787	if (exists $self->{template}) {
1425	my $layout = new CFClient::Layout;	1788	my $layout = new CFPlus::Layout;
1426	$layout->set_text (delete $self->{template});	1789	$layout->set_text (delete $self->{template});
1427	$self->{template} = $layout;	1790	$self->{template} = $layout;
1428	}	1791	}
1429		1792
1430	if (exists $self->{markup}) {	1793	if (exists $self->{markup}) {
…		…
1434	}	1797	}
1435		1798
1436	$self	1799	$self
1437	}	1800	}
1438		1801
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 {	1802	sub update {
1450	my ($self) = @_;	1803	my ($self) = @_;
1451		1804
1452	delete $self->{texture};	1805	delete $self->{texture};
1453	$self->SUPER::update;	1806	$self->SUPER::update;
1454	}	1807	}
1455		1808
		1809	sub realloc {
		1810	my ($self) = @_;
		1811
		1812	delete $self->{ox};
		1813	$self->SUPER::realloc;
		1814	}
		1815
1456	sub set_text {	1816	sub set_text {
1457	my ($self, $text) = @_;	1817	my ($self, $text) = @_;
1458		1818
1459	return if $self->{text} eq "T$text";	1819	return if $self->{text} eq "T$text";
1460	$self->{text} = "T$text";	1820	$self->{text} = "T$text";
1461		1821
1462	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463	$self->{layout}->set_text ($text);	1822	$self->{layout}->set_text ($text);
1464		1823
		1824	delete $self->{size_req};
		1825	$self->realloc;
1465	$self->update;	1826	$self->update;
1466	$self->check_size;
1467	}	1827	}
1468		1828
1469	sub set_markup {	1829	sub set_markup {
1470	my ($self, $markup) = @_;	1830	my ($self, $markup) = @_;
1471		1831
1472	return if $self->{text} eq "M$markup";	1832	return if $self->{text} eq "M$markup";
1473	$self->{text} = "M$markup";	1833	$self->{text} = "M$markup";
1474		1834
1475	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1835	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476		1836
1477	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478	$self->{layout}->set_markup ($markup);	1837	$self->{layout}->set_markup ($markup);
1479		1838
		1839	delete $self->{size_req};
		1840	$self->realloc;
1480	$self->update;	1841	$self->update;
1481	$self->check_size;
1482	}	1842	}
1483		1843
1484	sub size_request {	1844	sub size_request {
1485	my ($self) = @_;	1845	my ($self) = @_;
1486		1846
		1847	$self->{size_req} ||= do {
1487	$self->{layout}->set_font ($self->{font}) if $self->{font};	1848	$self->{layout}->set_font ($self->{font}) if $self->{font};
1488	$self->{layout}->set_width ($self->{max_w} || -1);	1849	$self->{layout}->set_width ($self->{max_w} || -1);
1489	$self->{layout}->set_ellipsise ($self->{ellipsise});	1850	$self->{layout}->set_ellipsise ($self->{ellipsise});
1490	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1851	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1491	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1852	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1492		1853
1493	my ($w, $h) = $self->{layout}->size;	1854	my ($w, $h) = $self->{layout}->size;
1494		1855
1495	if (exists $self->{template}) {	1856	if (exists $self->{template}) {
1496	$self->{template}->set_font ($self->{font}) if $self->{font};	1857	$self->{template}->set_font ($self->{font}) if $self->{font};
		1858	$self->{template}->set_width ($self->{max_w} || -1);
1497	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1859	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1498		1860
1499	my ($w2, $h2) = $self->{template}->size;	1861	my ($w2, $h2) = $self->{template}->size;
1500		1862
1501	$w = List::Util::max $w, $w2;	1863	$w = List::Util::max $w, $w2;
1502	$h = List::Util::max $h, $h2;	1864	$h = List::Util::max $h, $h2;
		1865	}
		1866
		1867	[$w, $h]
1503	}	1868	};
1504		1869
1505	(	1870	@{ $self->{size_req} }
1506	$w + $self->{padding} * 2,
1507	$h + $self->{padding} * 2,
1508	)
1509	}	1871	}
1510		1872
		1873	sub baseline_shift {
		1874	$_[0]{layout}->descent
		1875	}
		1876
1511	sub size_allocate {	1877	sub invoke_size_allocate {
1512	my ($self, $w, $h) = @_;	1878	my ($self, $w, $h) = @_;
1513		1879
		1880	delete $self->{ox};
		1881
1514	delete $self->{texture};	1882	delete $self->{texture}
		1883	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1884
		1885	1
1515	}	1886	}
1516		1887
1517	sub set_fontsize {	1888	sub set_fontsize {
1518	my ($self, $fontsize) = @_;	1889	my ($self, $fontsize) = @_;
1519		1890
1520	$self->{fontsize} = $fontsize;	1891	$self->{fontsize} = $fontsize;
		1892	delete $self->{size_req};
1521	delete $self->{texture};	1893	delete $self->{texture};
1522		1894
1523	$self->update;	1895	$self->realloc;
1524	$self->check_size;	1896	}
		1897
		1898	sub reconfigure {
		1899	my ($self) = @_;
		1900
		1901	delete $self->{size_req};
		1902	delete $self->{texture};
		1903
		1904	$self->SUPER::reconfigure;
1525	}	1905	}
1526		1906
1527	sub _draw {	1907	sub _draw {
1528	my ($self) = @_;	1908	my ($self) = @_;
1529		1909
1530	$self->SUPER::_draw; # draw background, if applicable	1910	$self->SUPER::_draw; # draw background, if applicable
1531		1911
1532	my $tex = $self->{texture} ||= do {	1912	my $size = $self->{texture} ||= do {
1533	$self->{layout}->set_foreground (@{$self->{fg}});	1913	$self->{layout}->set_foreground (@{$self->{fg}});
1534	$self->{layout}->set_font ($self->{font}) if $self->{font};	1914	$self->{layout}->set_font ($self->{font}) if $self->{font};
1535	$self->{layout}->set_width ($self->{w});	1915	$self->{layout}->set_width ($self->{w});
1536	$self->{layout}->set_ellipsise ($self->{ellipsise});	1916	$self->{layout}->set_ellipsise ($self->{ellipsise});
1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1917	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1918	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539		1919
1540	my $tex = new_from_layout CFClient::Texture $self->{layout};	1920	[$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	};	1921	};
1552		1922
1553	glEnable GL_TEXTURE_2D;	1923	unless (exists $self->{ox}) {
1554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1924	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
		1925	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
		1926	: ($self->{w} - $size->[0]) * 0.5);
1555		1927
1556	if ($tex->{format} == GL_ALPHA) {	1928	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557	glColor @{$self->{fg}};	1929	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1558	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1930	: ($self->{h} - $size->[1]) * 0.5);
1559	} else {
1560	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1561	}	1931	};
1562		1932
1563	glDisable GL_TEXTURE_2D;	1933	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1934	my $h = List::Util::min $self->{h} + 2, $size->[1];
		1935
		1936	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1564	}	1937	}
1565		1938
1566	#############################################################################	1939	#############################################################################
1567		1940
1568	package CFClient::UI::EntryBase;	1941	package CFPlus::UI::EntryBase;
1569		1942
1570	our @ISA = CFClient::UI::Label::;	1943	our @ISA = CFPlus::UI::Label::;
1571		1944
1572	use CFClient::OpenGL;	1945	use CFPlus::OpenGL;
1573		1946
1574	sub new {	1947	sub new {
1575	my $class = shift;	1948	my $class = shift;
1576		1949
1577	$class->SUPER::new (	1950	$class->SUPER::new (
…		…
1581	active_fg => [0, 0, 0],	1954	active_fg => [0, 0, 0],
1582	can_hover => 1,	1955	can_hover => 1,
1583	can_focus => 1,	1956	can_focus => 1,
1584	valign => 0,	1957	valign => 0,
1585	can_events => 1,	1958	can_events => 1,
		1959	ellipsise => 0,
1586	#text => ...	1960	#text => ...
		1961	#hidden => "*",
1587	@_	1962	@_
1588	)	1963	)
1589	}	1964	}
1590		1965
1591	sub _set_text {	1966	sub _set_text {
…		…
1593		1968
1594	delete $self->{cur_h};	1969	delete $self->{cur_h};
1595		1970
1596	return if $self->{text} eq $text;	1971	return if $self->{text} eq $text;
1597		1972
1598	delete $self->{texture};
1599
1600	$self->{last_activity} = $::NOW;	1973	$self->{last_activity} = $::NOW;
1601	$self->{text} = $text;	1974	$self->{text} = $text;
1602		1975
1603	$text =~ s/./*/g if $self->{hidden};	1976	$text =~ s/./*/g if $self->{hidden};
1604	$self->{layout}->set_text ("$text ");	1977	$self->{layout}->set_text ("$text ");
		1978	delete $self->{size_req};
1605		1979
1606	$self->_emit (changed => $self->{text});	1980	$self->emit (changed => $self->{text});
		1981
		1982	$self->realloc;
		1983	$self->update;
1607	}	1984	}
1608		1985
1609	sub set_text {	1986	sub set_text {
1610	my ($self, $text) = @_;	1987	my ($self, $text) = @_;
1611		1988
1612	$self->{cursor} = length $text;	1989	$self->{cursor} = length $text;
1613	$self->_set_text ($text);	1990	$self->_set_text ($text);
1614	$self->update;
1615	$self->check_size;
1616	}	1991	}
1617		1992
1618	sub get_text {	1993	sub get_text {
1619	$_[0]{text}	1994	$_[0]{text}
1620	}	1995	}
…		…
1625	my ($w, $h) = $self->SUPER::size_request;	2000	my ($w, $h) = $self->SUPER::size_request;
1626		2001
1627	($w + 1, $h) # add 1 for cursor	2002	($w + 1, $h) # add 1 for cursor
1628	}	2003	}
1629		2004
1630	sub key_down {	2005	sub invoke_key_down {
1631	my ($self, $ev) = @_;	2006	my ($self, $ev) = @_;
1632		2007
1633	my $mod = $ev->{mod};	2008	my $mod = $ev->{mod};
1634	my $sym = $ev->{sym};	2009	my $sym = $ev->{sym};
1635	my $uni = $ev->{unicode};	2010	my $uni = $ev->{unicode};
1636		2011
1637	my $text = $self->get_text;	2012	my $text = $self->get_text;
		2013
		2014	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1638		2015
1639	if ($uni == 8) {	2016	if ($uni == 8) {
1640	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2017	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1641	} elsif ($uni == 127) {	2018	} elsif ($uni == 127) {
1642	substr $text, $self->{cursor}, 1, "";	2019	substr $text, $self->{cursor}, 1, "";
1643	} elsif ($sym == CFClient::SDLK_LEFT) {	2020	} elsif ($sym == CFPlus::SDLK_LEFT) {
1644	--$self->{cursor} if $self->{cursor};	2021	--$self->{cursor} if $self->{cursor};
1645	} elsif ($sym == CFClient::SDLK_RIGHT) {	2022	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1646	++$self->{cursor} if $self->{cursor} < length $self->{text};	2023	++$self->{cursor} if $self->{cursor} < length $self->{text};
1647	} elsif ($sym == CFClient::SDLK_HOME) {	2024	} elsif ($sym == CFPlus::SDLK_HOME) {
		2025	# what a hack
		2026	$self->{cursor} =
		2027	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2028	? length $1
		2029	: 0;
		2030	} elsif ($sym == CFPlus::SDLK_END) {
		2031	# uh, again
		2032	$self->{cursor} =
		2033	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2034	? $self->{cursor} + length $1
		2035	: length $self->{text};
		2036	} elsif ($uni == 21) { # ctrl-u
		2037	$text = "";
1648	$self->{cursor} = 0;	2038	$self->{cursor} = 0;
1649	} elsif ($sym == CFClient::SDLK_END) {
1650	$self->{cursor} = length $text;
1651	} elsif ($uni == 27) {	2039	} elsif ($uni == 27) {
1652	$self->_emit ('escape');	2040	$self->emit ('escape');
1653	} elsif ($uni) {	2041	} elsif ($uni == 0x0d) {
		2042	substr $text, $self->{cursor}++, 0, "\012";
		2043	} elsif ($uni >= 0x20) {
1654	substr $text, $self->{cursor}++, 0, chr $uni;	2044	substr $text, $self->{cursor}++, 0, chr $uni;
		2045	} else {
		2046	return 0;
1655	}	2047	}
1656		2048
1657	$self->_set_text ($text);	2049	$self->_set_text ($text);
		2050
		2051	$self->realloc;
1658	$self->update;	2052	$self->update;
1659	$self->check_size;
1660	}
1661		2053
		2054	1
		2055	}
		2056
1662	sub focus_in {	2057	sub invoke_focus_in {
1663	my ($self) = @_;	2058	my ($self) = @_;
1664		2059
1665	$self->{last_activity} = $::NOW;	2060	$self->{last_activity} = $::NOW;
1666		2061
1667	$self->SUPER::focus_in;	2062	$self->SUPER::invoke_focus_in
1668	}	2063	}
1669		2064
1670	sub button_down {	2065	sub invoke_button_down {
1671	my ($self, $ev, $x, $y) = @_;	2066	my ($self, $ev, $x, $y) = @_;
1672		2067
1673	$self->SUPER::button_down ($ev, $x, $y);	2068	$self->SUPER::invoke_button_down ($ev, $x, $y);
1674		2069
1675	my $idx = $self->{layout}->xy_to_index ($x, $y);	2070	my $idx = $self->{layout}->xy_to_index ($x, $y);
1676		2071
1677	# byte-index to char-index	2072	# byte-index to char-index
1678	my $text = $self->{text};	2073	my $text = $self->{text};
1679	utf8::encode $text;	2074	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1680	$self->{cursor} = length substr $text, 0, $idx;	2075	$self->{cursor} = length $text;
1681		2076
1682	$self->_set_text ($self->{text});	2077	$self->_set_text ($self->{text});
1683	$self->update;	2078	$self->update;
		2079
		2080	1
1684	}	2081	}
1685		2082
1686	sub mouse_motion {	2083	sub invoke_mouse_motion {
1687	my ($self, $ev, $x, $y) = @_;	2084	my ($self, $ev, $x, $y) = @_;
1688	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2085	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2086
		2087	1
1689	}	2088	}
1690		2089
1691	sub _draw {	2090	sub _draw {
1692	my ($self) = @_;	2091	my ($self) = @_;
1693		2092
1694	local $self->{fg} = $self->{fg};	2093	local $self->{fg} = $self->{fg};
1695		2094
1696	if ($FOCUS == $self) {	2095	if ($FOCUS == $self) {
1697	glColor @{$self->{active_bg}};	2096	glColor_premultiply @{$self->{active_bg}};
1698	$self->{fg} = $self->{active_fg};	2097	$self->{fg} = $self->{active_fg};
1699	} else {	2098	} else {
1700	glColor @{$self->{bg}};	2099	glColor_premultiply @{$self->{bg}};
1701	}	2100	}
1702		2101
1703	glEnable GL_BLEND;	2102	glEnable GL_BLEND;
1704	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2103	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1705	glBegin GL_QUADS;	2104	glBegin GL_QUADS;
1706	glVertex 0 , 0;	2105	glVertex 0 , 0;
1707	glVertex 0 , $self->{h};	2106	glVertex 0 , $self->{h};
1708	glVertex $self->{w}, $self->{h};	2107	glVertex $self->{w}, $self->{h};
1709	glVertex $self->{w}, 0;	2108	glVertex $self->{w}, 0;
…		…
1720	utf8::encode $text;	2119	utf8::encode $text;
1721		2120
1722	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2121	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1723	}	2122	}
1724		2123
1725	glColor @{$self->{fg}};
1726	glBegin GL_LINES;	2124	glBegin GL_LINES;
1727	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2125	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};	2126	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1729	glEnd;	2127	glEnd;
1730	}	2128	}
1731	}	2129	}
1732		2130
		2131	#############################################################################
		2132
1733	package CFClient::UI::Entry;	2133	package CFPlus::UI::Entry;
1734		2134
1735	our @ISA = CFClient::UI::EntryBase::;	2135	our @ISA = CFPlus::UI::EntryBase::;
1736		2136
1737	use CFClient::OpenGL;	2137	use CFPlus::OpenGL;
1738		2138
1739	sub key_down {	2139	sub invoke_key_down {
1740	my ($self, $ev) = @_;	2140	my ($self, $ev) = @_;
1741		2141
1742	my $sym = $ev->{sym};	2142	my $sym = $ev->{sym};
1743		2143
1744	if ($sym == 13) {	2144	if ($ev->{uni} == 0x0d || $sym == 13) {
1745	unshift @{$self->{history}},	2145	unshift @{$self->{history}},
1746	my $txt = $self->get_text;	2146	my $txt = $self->get_text;
		2147
1747	$self->{history_pointer} = -1;	2148	$self->{history_pointer} = -1;
1748	$self->{history_saveback} = '';	2149	$self->{history_saveback} = '';
1749	$self->_emit (activate => $txt);	2150	$self->emit (activate => $txt);
1750	$self->update;	2151	$self->update;
1751		2152
1752	} elsif ($sym == CFClient::SDLK_UP) {	2153	} elsif ($sym == CFPlus::SDLK_UP) {
1753	if ($self->{history_pointer} < 0) {	2154	if ($self->{history_pointer} < 0) {
1754	$self->{history_saveback} = $self->get_text;	2155	$self->{history_saveback} = $self->get_text;
1755	}	2156	}
1756	if (@{$self->{history} || []} > 0) {	2157	if (@{$self->{history} || []} > 0) {
1757	$self->{history_pointer}++;	2158	$self->{history_pointer}++;
…		…
1759	$self->{history_pointer} = @{$self->{history} || []} - 1;	2160	$self->{history_pointer} = @{$self->{history} || []} - 1;
1760	}	2161	}
1761	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2162	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1762	}	2163	}
1763		2164
1764	} elsif ($sym == CFClient::SDLK_DOWN) {	2165	} elsif ($sym == CFPlus::SDLK_DOWN) {
1765	$self->{history_pointer}--;	2166	$self->{history_pointer}--;
1766	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2167	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1767		2168
1768	if ($self->{history_pointer} >= 0) {	2169	if ($self->{history_pointer} >= 0) {
1769	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2170	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1770	} else {	2171	} else {
1771	$self->set_text ($self->{history_saveback});	2172	$self->set_text ($self->{history_saveback});
1772	}	2173	}
1773		2174
1774	} else {	2175	} else {
1775	$self->SUPER::key_down ($ev);	2176	return $self->SUPER::invoke_key_down ($ev)
		2177	}
		2178
1776	}	2179	1
1777
1778	}	2180	}
1779		2181
1780	#############################################################################	2182	#############################################################################
1781		2183
		2184	package CFPlus::UI::TextEdit;
		2185
		2186	our @ISA = CFPlus::UI::EntryBase::;
		2187
		2188	use CFPlus::OpenGL;
		2189
		2190	sub move_cursor_ver {
		2191	my ($self, $dy) = @_;
		2192
		2193	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2194
		2195	$y += $dy;
		2196
		2197	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2198	$self->{cursor} = $index;
		2199	delete $self->{cur_h};
		2200	$self->update;
		2201	return;
		2202	}
		2203	}
		2204
		2205	sub invoke_key_down {
		2206	my ($self, $ev) = @_;
		2207
		2208	my $sym = $ev->{sym};
		2209
		2210	if ($sym == CFPlus::SDLK_UP) {
		2211	$self->move_cursor_ver (-1);
		2212	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2213	$self->move_cursor_ver (+1);
		2214	} else {
		2215	return $self->SUPER::invoke_key_down ($ev)
		2216	}
		2217
		2218	1
		2219	}
		2220
		2221	#############################################################################
		2222
1782	package CFClient::UI::Button;	2223	package CFPlus::UI::Button;
1783		2224
1784	our @ISA = CFClient::UI::Label::;	2225	our @ISA = CFPlus::UI::Label::;
1785		2226
1786	use CFClient::OpenGL;	2227	use CFPlus::OpenGL;
1787		2228
1788	my @tex =	2229	my @tex =
1789	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2230	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1790	qw(b1_button_active.png);	2231	qw(b1_button_active.png);
1791		2232
1792	sub new {	2233	sub new {
1793	my $class = shift;	2234	my $class = shift;
1794		2235
1795	$class->SUPER::new (	2236	$class->SUPER::new (
1796	padding => 4,	2237	padding_x => 4,
		2238	padding_y => 4,
1797	fg => [1, 1, 1],	2239	fg => [1, 1, 1],
1798	active_fg => [0, 0, 1],	2240	active_fg => [0, 0, 1],
1799	can_hover => 1,	2241	can_hover => 1,
1800	align => 0,	2242	align => 0,
1801	valign => 0,	2243	valign => 0,
1802	can_events => 1,	2244	can_events => 1,
1803	@_	2245	@_
1804	)	2246	)
1805	}	2247	}
1806		2248
1807	sub activate { }
1808
1809	sub button_up {	2249	sub invoke_button_up {
1810	my ($self, $ev, $x, $y) = @_;	2250	my ($self, $ev, $x, $y) = @_;
1811		2251
1812	$self->emit ("activate")	2252	$self->emit ("activate")
1813	if $x >= 0 && $x < $self->{w}	2253	if $x >= 0 && $x < $self->{w}
1814	&& $y >= 0 && $y < $self->{h};	2254	&& $y >= 0 && $y < $self->{h};
		2255
		2256	1
1815	}	2257	}
1816		2258
1817	sub _draw {	2259	sub _draw {
1818	my ($self) = @_;	2260	my ($self) = @_;
1819		2261
1820	local $self->{fg} = $self->{fg};	2262	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1821
1822	if ($GRAB == $self) {
1823	$self->{fg} = $self->{active_fg};
1824	}
1825		2263
1826	glEnable GL_TEXTURE_2D;	2264	glEnable GL_TEXTURE_2D;
1827	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2265	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1828	glColor 0, 0, 0, 1;	2266	glColor 0, 0, 0, 1;
1829		2267
…		…
1834	$self->SUPER::_draw;	2272	$self->SUPER::_draw;
1835	}	2273	}
1836		2274
1837	#############################################################################	2275	#############################################################################
1838		2276
1839	package CFClient::UI::CheckBox;	2277	package CFPlus::UI::CheckBox;
1840		2278
1841	our @ISA = CFClient::UI::DrawBG::;	2279	our @ISA = CFPlus::UI::DrawBG::;
1842		2280
1843	my @tex =	2281	my @tex =
1844	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2282	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1845	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2283	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1846		2284
1847	use CFClient::OpenGL;	2285	use CFPlus::OpenGL;
1848		2286
1849	sub new {	2287	sub new {
1850	my $class = shift;	2288	my $class = shift;
1851		2289
1852	$class->SUPER::new (	2290	$class->SUPER::new (
1853	padding => 2,	2291	padding_x => 2,
		2292	padding_y => 2,
1854	fg => [1, 1, 1],	2293	fg => [1, 1, 1],
1855	active_fg => [1, 1, 0],	2294	active_fg => [1, 1, 0],
1856	bg => [0, 0, 0, 0.2],	2295	bg => [0, 0, 0, 0.2],
1857	active_bg => [1, 1, 1, 0.5],	2296	active_bg => [1, 1, 1, 0.5],
1858	state => 0,	2297	state => 0,
…		…
1862	}	2301	}
1863		2302
1864	sub size_request {	2303	sub size_request {
1865	my ($self) = @_;	2304	my ($self) = @_;
1866		2305
1867	($self->{padding} * 2 + 6) x 2	2306	(6) x 2
1868	}	2307	}
1869		2308
		2309	sub toggle {
		2310	my ($self) = @_;
		2311
		2312	$self->{state} = !$self->{state};
		2313	$self->emit (changed => $self->{state});
		2314	$self->update;
		2315	}
		2316
1870	sub button_down {	2317	sub invoke_button_down {
1871	my ($self, $ev, $x, $y) = @_;	2318	my ($self, $ev, $x, $y) = @_;
1872		2319
1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2320	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2321	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875	$self->{state} = !$self->{state};	2322	$self->toggle;
1876	$self->_emit (changed => $self->{state});	2323	} else {
		2324	return 0
		2325	}
		2326
1877	}	2327	1
1878	}	2328	}
1879		2329
1880	sub _draw {	2330	sub _draw {
1881	my ($self) = @_;	2331	my ($self) = @_;
1882		2332
1883	$self->SUPER::_draw;	2333	$self->SUPER::_draw;
1884		2334
1885	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2335	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886		2336
1887	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2337	my ($w, $h) = @$self{qw(w h)};
		2338
		2339	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888		2340
1889	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2341	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890		2342
1891	my $tex = $self->{state} ? $tex[1] : $tex[0];	2343	my $tex = $self->{state} ? $tex[1] : $tex[0];
1892		2344
…		…
1895	glDisable GL_TEXTURE_2D;	2347	glDisable GL_TEXTURE_2D;
1896	}	2348	}
1897		2349
1898	#############################################################################	2350	#############################################################################
1899		2351
1900	package CFClient::UI::Image;	2352	package CFPlus::UI::Image;
1901		2353
1902	our @ISA = CFClient::UI::Base::;	2354	our @ISA = CFPlus::UI::Base::;
1903		2355
1904	use CFClient::OpenGL;	2356	use CFPlus::OpenGL;
1905	use Carp qw/confess/;
1906		2357
1907	our %loaded_images;	2358	our %texture_cache;
1908		2359
1909	sub new {	2360	sub new {
1910	my $class = shift;	2361	my $class = shift;
1911		2362
1912	my $self = $class->SUPER::new (can_events => 0, @_);	2363	my $self = $class->SUPER::new (
		2364	can_events => 0,
		2365	@_,
		2366	);
1913		2367
1914	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2368	$self->{path} || $self->{tex}
		2369	or Carp::croak "'path' or 'tex' attributes required";
1915		2370
1916	$loaded_images{$self->{image}} ||=	2371	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1917	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2372	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1918		2373
1919	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2374	CFPlus::weaken $texture_cache{$self->{path}};
1920		2375
1921	Scalar::Util::weaken $loaded_images{$self->{image}};	2376	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1922
1923	$self->{aspect} = $tex->{w} / $tex->{h};
1924		2377
1925	$self	2378	$self
1926	}	2379	}
1927		2380
		2381	sub STORABLE_freeze {
		2382	my ($self, $cloning) = @_;
		2383
		2384	$self->{path}
		2385	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2386
		2387	$self->{path}
		2388	}
		2389
		2390	sub STORABLE_attach {
		2391	my ($self, $cloning, $path) = @_;
		2392
		2393	$self->new (path => $path)
		2394	}
		2395
1928	sub size_request {	2396	sub size_request {
1929	my ($self) = @_;	2397	my ($self) = @_;
1930		2398
1931	($self->{tex}->{w}, $self->{tex}->{h})	2399	($self->{tex}{w}, $self->{tex}{h})
1932	}	2400	}
1933		2401
1934	sub _draw {	2402	sub _draw {
1935	my ($self) = @_;	2403	my ($self) = @_;
1936		2404
…		…
1946	}	2414	}
1947		2415
1948	glEnable GL_TEXTURE_2D;	2416	glEnable GL_TEXTURE_2D;
1949	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1950		2418
1951	$tex->draw_quad_alpha (0, 0, $w, $h);	2419	$tex->draw_quad (0, 0, $w, $h);
1952		2420
1953	glDisable GL_TEXTURE_2D;	2421	glDisable GL_TEXTURE_2D;
1954	}	2422	}
1955		2423
1956	#############################################################################	2424	#############################################################################
1957		2425
		2426	package CFPlus::UI::ImageButton;
		2427
		2428	our @ISA = CFPlus::UI::Image::;
		2429
		2430	use CFPlus::OpenGL;
		2431
		2432	my %textures;
		2433
		2434	sub new {
		2435	my $class = shift;
		2436
		2437	my $self = $class->SUPER::new (
		2438	padding_x => 4,
		2439	padding_y => 4,
		2440	fg => [1, 1, 1],
		2441	active_fg => [0, 0, 1],
		2442	can_hover => 1,
		2443	align => 0,
		2444	valign => 0,
		2445	can_events => 1,
		2446	@_
		2447	);
		2448	}
		2449
		2450	sub invoke_button_up {
		2451	my ($self, $ev, $x, $y) = @_;
		2452
		2453	$self->emit ("activate")
		2454	if $x >= 0 && $x < $self->{w}
		2455	&& $y >= 0 && $y < $self->{h};
		2456
		2457	1
		2458	}
		2459
		2460	#############################################################################
		2461
1958	package CFClient::UI::VGauge;	2462	package CFPlus::UI::VGauge;
1959		2463
1960	our @ISA = CFClient::UI::Base::;	2464	our @ISA = CFPlus::UI::Base::;
1961		2465
1962	use List::Util qw(min max);	2466	use List::Util qw(min max);
1963		2467
1964	use CFClient::OpenGL;	2468	use CFPlus::OpenGL;
1965		2469
1966	my %tex = (	2470	my %tex = (
1967	food => [	2471	food => [
1968	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2472	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1969	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2473	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1970	],	2474	],
1971	grace => [	2475	grace => [
1972	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2476	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/	2477	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1974	],	2478	],
1975	hp => [	2479	hp => [
1976	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2480	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1977	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2481	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1978	],	2482	],
1979	mana => [	2483	mana => [
1980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2484	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/	2485	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1982	],	2486	],
1983	);	2487	);
1984		2488
1985	# eg. VGauge->new (gauge => 'food'), default gauge: food	2489	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2045	my $ycut1 = max 0, min 1, $ycut;	2549	my $ycut1 = max 0, min 1, $ycut;
2046	my $ycut2 = max 0, min 1, $ycut - 1;	2550	my $ycut2 = max 0, min 1, $ycut - 1;
2047		2551
2048	my $h1 = $self->{h} * (1 - $ycut1);	2552	my $h1 = $self->{h} * (1 - $ycut1);
2049	my $h2 = $self->{h} * (1 - $ycut2);	2553	my $h2 = $self->{h} * (1 - $ycut2);
		2554	my $h3 = $self->{h};
		2555
		2556	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2050		2557
2051	glEnable GL_BLEND;	2558	glEnable GL_BLEND;
2052	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2559	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2560	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2053	glEnable GL_TEXTURE_2D;	2561	glEnable GL_TEXTURE_2D;
2054	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2562	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055		2563
2056	glBindTexture GL_TEXTURE_2D, $t1->{name};	2564	glBindTexture GL_TEXTURE_2D, $t1->{name};
2057	glBegin GL_QUADS;	2565	glBegin GL_QUADS;
…		…
2072		2580
2073	if ($t3) {	2581	if ($t3) {
2074	glBindTexture GL_TEXTURE_2D, $t3->{name};	2582	glBindTexture GL_TEXTURE_2D, $t3->{name};
2075	glBegin GL_QUADS;	2583	glBegin GL_QUADS;
2076	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2584	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2077	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2585	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2078	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2586	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2079	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2587	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2080	glEnd;	2588	glEnd;
2081	}	2589	}
2082		2590
2083	glDisable GL_BLEND;	2591	glDisable GL_BLEND;
2084	glDisable GL_TEXTURE_2D;	2592	glDisable GL_TEXTURE_2D;
2085	}	2593	}
2086		2594
2087	#############################################################################	2595	#############################################################################
2088		2596
2089	package CFClient::UI::Gauge;	2597	package CFPlus::UI::Gauge;
2090		2598
2091	our @ISA = CFClient::UI::VBox::;	2599	our @ISA = CFPlus::UI::VBox::;
2092		2600
2093	sub new {	2601	sub new {
2094	my ($class, %arg) = @_;	2602	my ($class, %arg) = @_;
2095		2603
2096	my $self = $class->SUPER::new (	2604	my $self = $class->SUPER::new (
…		…
2098	can_hover => 1,	2606	can_hover => 1,
2099	can_events => 1,	2607	can_events => 1,
2100	%arg,	2608	%arg,
2101	);	2609	);
2102		2610
2103	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2611	$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);	2612	$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");	2613	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2106		2614
2107	$self	2615	$self
2108	}	2616	}
2109		2617
2110	sub set_fontsize {	2618	sub set_fontsize {
…		…
2131	$self->{value}->set_text ($val);	2639	$self->{value}->set_text ($val);
2132	}	2640	}
2133		2641
2134	#############################################################################	2642	#############################################################################
2135		2643
2136	package CFClient::UI::Slider;	2644	package CFPlus::UI::Slider;
2137		2645
2138	use strict;	2646	use strict;
2139		2647
2140	use CFClient::OpenGL;	2648	use CFPlus::OpenGL;
2141		2649
2142	our @ISA = CFClient::UI::DrawBG::;	2650	our @ISA = CFPlus::UI::DrawBG::;
2143		2651
2144	my @tex =	2652	my @tex =
2145	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2653	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2146	qw(s1_slider.png s1_slider_bg.png);	2654	qw(s1_slider.png s1_slider_bg.png);
2147		2655
2148	sub new {	2656	sub new {
2149	my $class = shift;	2657	my $class = shift;
2150		2658
…		…
2157	fg => [1, 1, 1],	2665	fg => [1, 1, 1],
2158	active_fg => [0, 0, 0],	2666	active_fg => [0, 0, 0],
2159	bg => [0, 0, 0, 0.2],	2667	bg => [0, 0, 0, 0.2],
2160	active_bg => [1, 1, 1, 0.5],	2668	active_bg => [1, 1, 1, 0.5],
2161	range => [0, 0, 100, 10, 0],	2669	range => [0, 0, 100, 10, 0],
2162	req_w => $::WIDTH / 80,	2670	min_w => $::WIDTH / 80,
2163	req_h => $::WIDTH / 80,	2671	min_h => $::WIDTH / 80,
2164	vertical => 0,	2672	vertical => 0,
2165	can_hover => 1,	2673	can_hover => 1,
2166	inner_pad => 0.02,	2674	inner_pad => 0.02,
2167	@_	2675	@_
2168	);	2676	);
…		…
2176	sub set_range {	2684	sub set_range {
2177	my ($self, $range) = @_;	2685	my ($self, $range) = @_;
2178		2686
2179	($range, $self->{range}) = ($self->{range}, $range);	2687	($range, $self->{range}) = ($self->{range}, $range);
2180		2688
2181	$self->update
2182	if "@$range" ne "@{$self->{range}}";	2689	if ("@$range" ne "@{$self->{range}}") {
		2690	$self->update;
		2691	$self->set_value ($self->{range}[0]);
		2692	}
2183	}	2693	}
2184		2694
2185	sub set_value {	2695	sub set_value {
2186	my ($self, $value) = @_;	2696	my ($self, $value) = @_;
2187		2697
…		…
2198	if $unit;	2708	if $unit;
2199		2709
2200	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2710	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2201		2711
2202	if ($value != $old_value) {	2712	if ($value != $old_value) {
2203	$self->_emit (changed => $value);	2713	$self->emit (changed => $value);
2204	$self->update;	2714	$self->update;
2205	}	2715	}
2206	}	2716	}
2207		2717
2208	sub size_request {	2718	sub size_request {
2209	my ($self) = @_;	2719	my ($self) = @_;
2210		2720
2211	my $w = $self->{req_w};	2721	($self->{req_w}, $self->{req_h})
2212	my $h = $self->{req_h};
2213
2214	$self->{vertical} ? ($h, $w) : ($w, $h)
2215	}	2722	}
2216		2723
2217	sub button_down {	2724	sub invoke_button_down {
2218	my ($self, $ev, $x, $y) = @_;	2725	my ($self, $ev, $x, $y) = @_;
2219		2726
2220	$self->SUPER::button_down ($ev, $x, $y);	2727	$self->SUPER::invoke_button_down ($ev, $x, $y);
2221		2728
2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2729	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223		2730
2224	$self->mouse_motion ($ev, $x, $y);	2731	$self->invoke_mouse_motion ($ev, $x, $y)
2225	}	2732	}
2226		2733
2227	sub mouse_motion {	2734	sub invoke_mouse_motion {
2228	my ($self, $ev, $x, $y) = @_;	2735	my ($self, $ev, $x, $y) = @_;
2229		2736
2230	if ($GRAB == $self) {	2737	if ($GRAB == $self) {
2231	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2738	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2232		2739
2233	my (undef, $lo, $hi, $page) = @{$self->{range}};	2740	my (undef, $lo, $hi, $page) = @{$self->{range}};
2234		2741
2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2742	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236		2743
2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2744	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2745	} else {
		2746	return 0;
		2747	}
		2748
2238	}	2749	1
		2750	}
		2751
		2752	sub invoke_mouse_wheel {
		2753	my ($self, $ev) = @_;
		2754
		2755	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2756
		2757	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2758
		2759	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2760
		2761	! ! $delta
2239	}	2762	}
2240		2763
2241	sub update {	2764	sub update {
2242	my ($self) = @_;	2765	my ($self) = @_;
2243		2766
2244	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2767	delete $self->{knob_w};
		2768	$self->SUPER::update;
		2769	}
		2770
		2771	sub _draw {
		2772	my ($self) = @_;
		2773
		2774	unless ($self->{knob_w}) {
2245	$self->set_value ($self->{range}[0]);	2775	$self->set_value ($self->{range}[0]);
2246		2776
2247	my ($value, $lo, $hi, $page) = @{$self->{range}};	2777	my ($value, $lo, $hi, $page) = @{$self->{range}};
2248	my $range = ($hi - $page - $lo) || 1e-100;	2778	my $range = ($hi - $page - $lo) || 1e-100;
2249		2779
…		…
2255	$value = ($value - $lo) / $range;	2785	$value = ($value - $lo) / $range;
2256	$value = $value * $self->{scale} + $self->{offset};	2786	$value = $value * $self->{scale} + $self->{offset};
2257		2787
2258	$self->{knob_x} = $value - $knob_w * 0.5;	2788	$self->{knob_x} = $value - $knob_w * 0.5;
2259	$self->{knob_w} = $knob_w;	2789	$self->{knob_w} = $knob_w;
2260	});	2790	}
2261
2262	$self->SUPER::update;
2263	}
2264
2265	sub _draw {
2266	my ($self) = @_;
2267		2791
2268	$self->SUPER::_draw ();	2792	$self->SUPER::_draw ();
2269		2793
2270	glScale $self->{w}, $self->{h};	2794	glScale $self->{w}, $self->{h};
2271		2795
…		…
2291	glDisable GL_TEXTURE_2D;	2815	glDisable GL_TEXTURE_2D;
2292	}	2816	}
2293		2817
2294	#############################################################################	2818	#############################################################################
2295		2819
2296	package CFClient::UI::ValSlider;	2820	package CFPlus::UI::ValSlider;
2297		2821
2298	our @ISA = CFClient::UI::HBox::;	2822	our @ISA = CFPlus::UI::HBox::;
2299		2823
2300	sub new {	2824	sub new {
2301	my ($class, %arg) = @_;	2825	my ($class, %arg) = @_;
2302		2826
2303	my $range = delete $arg{range};	2827	my $range = delete $arg{range};
2304		2828
2305	my $self = $class->SUPER::new (	2829	my $self = $class->SUPER::new (
2306	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2830	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2307	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2831	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2308	to_value => sub { shift },	2832	to_value => sub { shift },
2309	from_value => sub { shift },	2833	from_value => sub { shift },
2310	%arg,	2834	%arg,
2311	);	2835	);
2312		2836
…		…
2332	sub set_range { shift->{slider}->set_range (@_) }	2856	sub set_range { shift->{slider}->set_range (@_) }
2333	sub set_value { shift->{slider}->set_value (@_) }	2857	sub set_value { shift->{slider}->set_value (@_) }
2334		2858
2335	#############################################################################	2859	#############################################################################
2336		2860
2337	package CFClient::UI::TextView;	2861	package CFPlus::UI::TextScroller;
2338		2862
2339	our @ISA = CFClient::UI::HBox::;	2863	our @ISA = CFPlus::UI::HBox::;
2340		2864
2341	use CFClient::OpenGL;	2865	use CFPlus::OpenGL;
2342		2866
2343	sub new {	2867	sub new {
2344	my $class = shift;	2868	my $class = shift;
2345		2869
2346	my $self = $class->SUPER::new (	2870	my $self = $class->SUPER::new (
2347	fontsize => 1,	2871	fontsize => 1,
2348	can_events => 0,	2872	can_events => 1,
		2873	indent => 0,
2349	#font => default_font	2874	#font => default_font
2350	@_,	2875	@_,
2351		2876
2352	layout => (new CFClient::Layout 1),	2877	layout => (new CFPlus::Layout),
2353	par => [],	2878	par => [],
		2879	max_par => 0,
2354	height => 0,	2880	height => 0,
2355	children => [	2881	children => [
2356	(new CFClient::UI::Empty expand => 1),	2882	(new CFPlus::UI::Empty expand => 1),
2357	(new CFClient::UI::Slider vertical => 1),	2883	(new CFPlus::UI::Slider vertical => 1),
2358	],	2884	],
2359	);	2885	);
2360		2886
2361	$self->{children}[1]->connect (changed => sub { $self->update });	2887	$self->{children}[1]->connect (changed => sub { $self->update });
2362		2888
…		…
2368		2894
2369	$self->{fontsize} = $fontsize;	2895	$self->{fontsize} = $fontsize;
2370	$self->reflow;	2896	$self->reflow;
2371	}	2897	}
2372		2898
		2899	sub size_request {
		2900	my ($self) = @_;
		2901
		2902	my ($empty, $slider) = @{ $self->{children} };
		2903
		2904	local $self->{children} = [$empty, $slider];
		2905	$self->SUPER::size_request
		2906	}
		2907
2373	sub size_allocate {	2908	sub invoke_size_allocate {
2374	my ($self, $w, $h) = @_;	2909	my ($self, $w, $h) = @_;
2375		2910
2376	$self->SUPER::size_allocate ($w, $h);	2911	my ($empty, $slider, @other) = @{ $self->{children} };
		2912	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2377		2913
2378	$self->{layout}->set_font ($self->{font}) if $self->{font};	2914	$self->{layout}->set_font ($self->{font}) if $self->{font};
2379	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2915	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2380	$self->{layout}->set_width ($self->{children}[0]{w});	2916	$self->{layout}->set_width ($empty->{w});
		2917	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2381		2918
2382	$self->reflow;	2919	$self->reflow;
2383	}
2384		2920
2385	sub text_size {	2921	local $self->{children} = [$empty, $slider];
		2922	$self->SUPER::invoke_size_allocate ($w, $h)
		2923	}
		2924
		2925	sub invoke_mouse_wheel {
2386	my ($self, $text, $indent) = @_;	2926	my ($self, $ev) = @_;
		2927
		2928	return 0 unless $ev->{dy}; # only vertical movements
		2929
		2930	$self->{children}[1]->emit (mouse_wheel => $ev);
		2931
		2932	1
		2933	}
		2934
		2935	sub get_layout {
		2936	my ($self, $para) = @_;
2387		2937
2388	my $layout = $self->{layout};	2938	my $layout = $self->{layout};
2389		2939
		2940	$layout->set_font ($self->{font}) if $self->{font};
		2941	$layout->set_foreground (@{$para->{fg}});
2390	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2942	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2391	$layout->set_width ($self->{children}[0]{w} - $indent);	2943	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2944	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2392	$layout->set_markup ($text);	2945	$layout->set_markup ($para->{markup});
		2946
		2947	$layout->set_shapes (
		2948	map
		2949	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2950	@{$para->{widget}}
2393		2951	);
		2952
2394	$layout->size	2953	$layout
2395	}	2954	}
2396		2955
2397	sub reflow {	2956	sub reflow {
2398	my ($self) = @_;	2957	my ($self) = @_;
2399		2958
…		…
2406		2965
2407	# todo: base offset on lines or so, not on pixels	2966	# todo: base offset on lines or so, not on pixels
2408	$self->{children}[1]->set_value ($offset);	2967	$self->{children}[1]->set_value ($offset);
2409	}	2968	}
2410		2969
		2970	sub current_paragraph {
		2971	my ($self) = @_;
		2972
		2973	$self->{top_paragraph} - 1
		2974	}
		2975
		2976	sub scroll_to {
		2977	my ($self, $para) = @_;
		2978
		2979	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2980
		2981	$self->{scroll_to} = $para;
		2982	$self->update;
		2983	}
		2984
2411	sub clear {	2985	sub clear {
2412	my ($self) = @_;	2986	my ($self) = @_;
		2987
		2988	my (undef, undef, @other) = @{ $self->{children} };
		2989	$self->remove ($_) for @other;
2413		2990
2414	$self->{par} = [];	2991	$self->{par} = [];
2415	$self->{height} = 0;	2992	$self->{height} = 0;
2416	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2993	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2417	}	2994	}
2418		2995
2419	sub add_paragraph {	2996	sub add_paragraph {
2420	my ($self, $color, $text, $indent) = @_;	2997	my $self = shift;
2421		2998
2422	for my $line (split /\n/, $text) {	2999	for my $para (@_) {
2423	my ($w, $h) = $self->text_size ($line);	3000	$para = {
		3001	fg => [1, 1, 1, 1],
		3002	indent => 0,
		3003	markup => "",
		3004	widget => [],
		3005	ref $para ? %$para : (markup => $para),
		3006	w => 1e10,
		3007	wrapped => 1,
		3008	};
		3009
		3010	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3011	push @{$self->{par}}, $para;
		3012	}
		3013
		3014	if (my $max = $self->{max_par}) {
		3015	shift @{$self->{par}} while @{$self->{par}} > $max;
		3016	}
		3017
		3018	$self->{need_reflow}++;
		3019	$self->update;
		3020	}
		3021
		3022	sub scroll_to_bottom {
		3023	my ($self) = @_;
		3024
		3025	$self->{scroll_to} = $#{$self->{par}};
		3026	$self->update;
		3027	}
		3028
		3029	sub force_uptodate {
		3030	my ($self) = @_;
		3031
		3032	if (delete $self->{need_reflow}) {
		3033	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3034
		3035	my $height = 0;
		3036
		3037	for my $para (@{$self->{par}}) {
		3038	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3039	my $layout = $self->get_layout ($para);
		3040	my ($w, $h) = $layout->size;
		3041
		3042	$para->{w} = $w + $para->{indent};
		3043	$para->{h} = $h;
		3044	$para->{wrapped} = $layout->has_wrapped;
		3045	}
		3046
		3047	$para->{y} = $height;
		3048	$height += $para->{h};
		3049	}
		3050
2424	$self->{height} += $h;	3051	$self->{height} = $height;
2425	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3052	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2426	}
2427		3053
2428	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3054	delete $self->{texture};
		3055	}
		3056
		3057	if (my $paridx = delete $self->{scroll_to}) {
		3058	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3059	}
2429	}	3060	}
2430		3061
2431	sub update {	3062	sub update {
2432	my ($self) = @_;	3063	my ($self) = @_;
2433		3064
…		…
2435		3066
2436	return unless $self->{h} > 0;	3067	return unless $self->{h} > 0;
2437		3068
2438	delete $self->{texture};	3069	delete $self->{texture};
2439		3070
2440	$ROOT->on_post_alloc ($self, sub {	3071	$ROOT->on_post_alloc ($self => sub {
		3072	$self->force_uptodate;
		3073
2441	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3074	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2442		3075
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 {	3076	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2470	glClearColor 0.5, 0.5, 0.5, 0;	3077	glClearColor 0, 0, 0, 0;
2471	glClear GL_COLOR_BUFFER_BIT;	3078	glClear GL_COLOR_BUFFER_BIT;
2472		3079
		3080	package CFPlus::UI::Base;
		3081	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3082	(0, 0, $self->{w}, $self->{h});
		3083
		3084	my $top = int $self->{children}[1]{range}[0];
		3085
		3086	my $paridx = 0;
		3087	my $top_paragraph;
2473	my $top = int $self->{children}[1]{range}[0];	3088	my $top = int $self->{children}[1]{range}[0];
2474		3089
2475	my $y0 = $top;	3090	my $y0 = $top;
2476	my $y1 = $top + $H;	3091	my $y1 = $top + $H;
2477		3092
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}}) {	3093	for my $para (@{$self->{par}}) {
2489	my $h = $par->[1];	3094	my $h = $para->{h};
		3095	my $y = $para->{y};
2490		3096
2491	if ($y0 < $y + $h && $y < $y1) {	3097	if ($y0 < $y + $h && $y < $y1) {
2492	$layout->set_foreground (@{ $par->[2] });	3098	my $layout = $self->get_layout ($para);
2493	$layout->set_width ($W - $par->[3]);
2494	$layout->set_markup ($par->[4]);
2495		3099
2496	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3100	$layout->render ($para->{indent}, $y - $y0);
2497		3101
2498	glRasterPos $par->[3], $y - $y0;	3102	if (my @w = @{ $para->{widget} }) {
2499	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3103	my @s = $layout->get_shapes;
		3104
		3105	for (@w) {
		3106	my ($dx, $dy) = splice @s, 0, 2, ();
		3107
		3108	$_->{x} = $dx + $para->{indent};
		3109	$_->{y} = $dy + $y - $y0;
		3110
		3111	$_->draw;
		3112	}
		3113	}
2500	}	3114	}
2501		3115
2502	$y += $h;	3116	$paridx++;
		3117	$top_paragraph ||= $paridx if $y >= $top;
2503	}	3118	}
2504		3119
2505	glDisable GL_BLEND;	3120	$self->{top_paragraph} = $top_paragraph;
2506	};	3121	};
2507	});	3122	});
2508	}	3123	}
2509		3124
		3125	sub reconfigure {
		3126	my ($self) = @_;
		3127
		3128	$self->SUPER::reconfigure;
		3129
		3130	$_->{w} = 1e10 for @{ $self->{par} };
		3131	$self->reflow;
		3132	}
		3133
2510	sub _draw {	3134	sub _draw {
2511	my ($self) = @_;	3135	my ($self) = @_;
2512		3136
2513	glEnable GL_TEXTURE_2D;	3137	glEnable GL_TEXTURE_2D;
2514	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3138	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515	glColor 1, 1, 1, 1;	3139	glColor 0, 0, 0, 1;
2516	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3140	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2517	glDisable GL_TEXTURE_2D;	3141	glDisable GL_TEXTURE_2D;
2518		3142
2519	$self->{children}[1]->draw;	3143	$self->{children}[1]->draw;
2520
2521	}	3144	}
2522		3145
2523	#############################################################################	3146	#############################################################################
2524		3147
2525	package CFClient::UI::Animator;	3148	package CFPlus::UI::Animator;
2526		3149
2527	use CFClient::OpenGL;	3150	use CFPlus::OpenGL;
2528		3151
2529	our @ISA = CFClient::UI::Bin::;	3152	our @ISA = CFPlus::UI::Bin::;
2530		3153
2531	sub moveto {	3154	sub moveto {
2532	my ($self, $x, $y) = @_;	3155	my ($self, $x, $y) = @_;
2533		3156
2534	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3157	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2562	glPopMatrix;	3185	glPopMatrix;
2563	}	3186	}
2564		3187
2565	#############################################################################	3188	#############################################################################
2566		3189
2567	package CFClient::UI::Flopper;	3190	package CFPlus::UI::Flopper;
2568		3191
2569	our @ISA = CFClient::UI::Button::;	3192	our @ISA = CFPlus::UI::Button::;
2570		3193
2571	sub new {	3194	sub new {
2572	my $class = shift;	3195	my $class = shift;
2573		3196
2574	my $self = $class->SUPER::new (	3197	my $self = $class->SUPER::new (
…		…
2586	$self->{other}->toggle_visibility;	3209	$self->{other}->toggle_visibility;
2587	}	3210	}
2588		3211
2589	#############################################################################	3212	#############################################################################
2590		3213
2591	package CFClient::UI::Tooltip;	3214	package CFPlus::UI::Tooltip;
2592		3215
2593	our @ISA = CFClient::UI::Bin::;	3216	our @ISA = CFPlus::UI::Bin::;
2594		3217
2595	use CFClient::OpenGL;	3218	use CFPlus::OpenGL;
2596		3219
2597	sub new {	3220	sub new {
2598	my $class = shift;	3221	my $class = shift;
2599		3222
2600	$class->SUPER::new (	3223	$class->SUPER::new (
…		…
2604	}	3227	}
2605		3228
2606	sub set_tooltip_from {	3229	sub set_tooltip_from {
2607	my ($self, $widget) = @_;	3230	my ($self, $widget) = @_;
2608		3231
		3232	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3233	if $widget->{tooltip} =~ /^#(.*)$/;
		3234
		3235	my $tooltip = $widget->{tooltip};
		3236
		3237	if ($ENV{CFPLUS_DEBUG} & 2) {
		3238	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3239	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3240	. "req $widget->{req_w} $widget->{req_h}\n"
		3241	. "visible $widget->{visible}";
		3242	}
		3243
		3244	$tooltip =~ s/^\n+//;
		3245	$tooltip =~ s/\n+$//;
		3246
2609	$self->add (new CFClient::UI::Label	3247	$self->add (new CFPlus::UI::Label
2610	markup => $widget->{tooltip},	3248	markup => $tooltip,
2611	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3249	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612	fontsize => 0.8,	3250	fontsize => 0.8,
2613	fg => [0, 0, 0, 1],	3251	style => 1, # FLAG_INVERSE
2614	ellipsise => 0,	3252	ellipsise => 0,
2615	font => ($widget->{tooltip_font} || $::FONT_PROP),	3253	font => ($widget->{tooltip_font} || $::FONT_PROP),
2616	);	3254	);
2617	}	3255	}
2618		3256
…		…
2622	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3260	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2623		3261
2624	($w + 4, $h + 4)	3262	($w + 4, $h + 4)
2625	}	3263	}
2626		3264
2627	sub size_allocate {	3265	sub invoke_size_allocate {
2628	my ($self, $w, $h) = @_;	3266	my ($self, $w, $h) = @_;
2629		3267
2630	$self->SUPER::size_allocate ($w - 4, $h - 4);	3268	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
		3269	}
		3270
		3271	sub invoke_visibility_change {
		3272	my ($self, $visible) = @_;
		3273
		3274	return unless $visible;
		3275
		3276	$self->{root}->on_post_alloc ("move_$self" => sub {
		3277	my $widget = $self->{owner}
		3278	or return;
		3279
		3280	if ($widget->{visible}) {
		3281	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		3282
		3283	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		3284	if $x + $self->{w} > $self->{root}{w};
		3285
		3286	$self->move_abs ($x, $y);
		3287	} else {
		3288	$self->hide;
		3289	}
		3290	});
2631	}	3291	}
2632		3292
2633	sub _draw {	3293	sub _draw {
2634	my ($self) = @_;	3294	my ($self) = @_;
2635		3295
…		…
2652	glVertex $w, $h;	3312	glVertex $w, $h;
2653	glVertex $w, 0;	3313	glVertex $w, 0;
2654	glEnd;	3314	glEnd;
2655		3315
2656	glTranslate 2 - 0.375, 2 - 0.375;	3316	glTranslate 2 - 0.375, 2 - 0.375;
		3317
2657	$self->SUPER::_draw;	3318	$self->SUPER::_draw;
2658	}	3319	}
2659		3320
2660	#############################################################################	3321	#############################################################################
2661		3322
2662	package CFClient::UI::Face;	3323	package CFPlus::UI::Face;
2663		3324
2664	our @ISA = CFClient::UI::Base::;	3325	our @ISA = CFPlus::UI::DrawBG::;
2665		3326
2666	use CFClient::OpenGL;	3327	use CFPlus::OpenGL;
2667		3328
2668	sub new {	3329	sub new {
2669	my $class = shift;	3330	my $class = shift;
2670		3331
2671	my $self = $class->SUPER::new (	3332	my $self = $class->SUPER::new (
		3333	size_w => 32,
		3334	size_h => 8,
2672	aspect => 1,	3335	aspect => 1,
2673	can_events => 0,	3336	can_events => 0,
2674	@_,	3337	@_,
2675	);	3338	);
2676		3339
2677	if ($self->{anim} && $self->{animspeed}) {	3340	if ($self->{anim} && $self->{animspeed}) {
2678	Scalar::Util::weaken (my $widget = $self);	3341	CFPlus::weaken (my $widget = $self);
2679		3342
2680	$self->{timer} = Event->timer (	3343	$self->{timer} = Event->timer (
2681	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3344	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2682	hard => 1,	3345	hard => 1,
2683	interval => $self->{animspeed},	3346	interval => $self->{animspeed},
2684	cb => sub {	3347	cb => sub {
		3348	return unless $::CONN;
		3349
2685	++$widget->{frame};	3350	++$widget->{frame};
		3351	$self->update_face;
2686	$widget->update;	3352	$self->update;
2687	},	3353	},
2688	);	3354	);
		3355
		3356	$self->update_face;
2689	}	3357	}
2690		3358
2691	$self	3359	$self
2692	}	3360	}
2693		3361
		3362	sub update_face {
		3363	my ($self) = @_;
		3364
		3365	return unless $::CONN;
		3366
		3367	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3368	if ($anim && @$anim) {
		3369	delete $self->{wait_face};
		3370	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3371	}
		3372	}
		3373	}
		3374
2694	sub size_request {	3375	sub size_request {
2695	(32, 8)	3376	my ($self) = @_;
		3377
		3378	if ($::CONN) {
		3379	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3380	if (my $tex = $::CONN->{texture}[$faceid]) {
		3381	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3382	} else {
		3383	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3384	$self->realloc;
		3385	});
		3386	}
		3387	}
		3388	}
		3389
		3390	($self->{size_w} || 8, $self->{size_h} || 8)
2696	}	3391	}
2697		3392
2698	sub update {	3393	sub update {
2699	my ($self) = @_;	3394	my ($self) = @_;
2700		3395
…		…
2706	sub _draw {	3401	sub _draw {
2707	my ($self) = @_;	3402	my ($self) = @_;
2708		3403
2709	return unless $::CONN;	3404	return unless $::CONN;
2710		3405
2711	my $face;	3406	$self->SUPER::_draw;
2712		3407
2713	if ($self->{frame}) {
2714	my $anim = $::CONN->{anim}[$self->{anim}];	3408	my $faceid = $::CONN->{faceid}[$self->{face}]
2715		3409	or return;
2716	$face = $anim->[ $self->{frame} % @$anim ]
2717	if $anim && @$anim;
2718	}
2719		3410
2720	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3411	my $tex = $::CONN->{texture}[$faceid];
2721		3412
2722	if ($tex) {	3413	if ($tex) {
2723	glEnable GL_TEXTURE_2D;	3414	glEnable GL_TEXTURE_2D;
2724	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2725	glColor 1, 1, 1, 1;	3416	glColor 0, 0, 0, 1;
2726	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2727	glDisable GL_TEXTURE_2D;	3418	glDisable GL_TEXTURE_2D;
2728	}	3419	}
2729	}	3420	}
2730		3421
2731	sub DESTROY {	3422	sub destroy {
2732	my ($self) = @_;	3423	my ($self) = @_;
2733		3424
2734	$self->{timer}->cancel	3425	$self->{timer}->cancel
2735	if $self->{timer};	3426	if $self->{timer};
2736		3427
2737	$self->SUPER::DESTROY;	3428	$self->SUPER::destroy;
2738	}	3429	}
2739		3430
2740	#############################################################################	3431	#############################################################################
2741		3432
2742	package CFClient::UI::Inventory;	3433	package CFPlus::UI::Buttonbar;
2743		3434
2744	our @ISA = CFClient::UI::ScrolledWindow::;	3435	our @ISA = CFPlus::UI::HBox::;
2745		3436
2746	sub new {	3437	# 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		3438
2782	#############################################################################	3439	#############################################################################
2783		3440
2784	package CFClient::UI::Menu;	3441	package CFPlus::UI::Menu;
2785		3442
2786	our @ISA = CFClient::UI::FancyFrame::;	3443	our @ISA = CFPlus::UI::Toplevel::;
2787		3444
2788	use CFClient::OpenGL;	3445	use CFPlus::OpenGL;
2789		3446
2790	sub new {	3447	sub new {
2791	my $class = shift;	3448	my $class = shift;
2792		3449
2793	my $self = $class->SUPER::new (	3450	my $self = $class->SUPER::new (
2794	items => [],	3451	items => [],
2795	z => 100,	3452	z => 100,
2796	@_,	3453	@_,
2797	);	3454	);
2798		3455
2799	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3456	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2800		3457
2801	for my $item (@{ $self->{items} }) {	3458	for my $item (@{ $self->{items} }) {
2802	my ($widget, $cb) = @$item;	3459	my ($widget, $cb, $tooltip) = @$item;
2803		3460
2804	# handle various types of items, only text for now	3461	# handle various types of items, only text for now
2805	if (!ref $widget) {	3462	if (!ref $widget) {
		3463	if ($widget =~ /\t/) {
		3464	my ($left, $right) = split /\t/, $widget, 2;
		3465
2806	$widget = new CFClient::UI::Label	3466	$widget = new CFPlus::UI::HBox
2807	can_hover => 1,	3467	can_hover => 1,
2808	can_events => 1,	3468	can_events => 1,
		3469	tooltip => $tooltip,
		3470	children => [
		3471	(new CFPlus::UI::Label markup => $left, expand => 1),
		3472	(new CFPlus::UI::Label markup => $right, align => +1),
		3473	],
		3474	;
		3475
		3476	} else {
		3477	$widget = new CFPlus::UI::Label
		3478	can_hover => 1,
		3479	can_events => 1,
2809	text => $widget;	3480	markup => $widget,
		3481	tooltip => $tooltip;
		3482	}
2810	}	3483	}
2811		3484
2812	$self->{item}{$widget} = $item;	3485	$self->{item}{$widget} = $item;
2813		3486
2814	$self->{vbox}->add ($widget);	3487	$self->{vbox}->add ($widget);
…		…
2819		3492
2820	# popup given the event (must be a mouse button down event currently)	3493	# popup given the event (must be a mouse button down event currently)
2821	sub popup {	3494	sub popup {
2822	my ($self, $ev) = @_;	3495	my ($self, $ev) = @_;
2823		3496
2824	$self->_emit ("popdown");	3497	$self->emit ("popdown");
2825		3498
2826	# maybe save $GRAB? must be careful about events...	3499	# maybe save $GRAB? must be careful about events...
2827	$GRAB = $self;	3500	$GRAB = $self;
2828	$self->{button} = $ev->{button};	3501	$self->{button} = $ev->{button};
2829		3502
2830	$self->show;	3503	$self->show;
2831	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3504	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2832	}	3505	}
2833		3506
2834	sub mouse_motion {	3507	sub invoke_mouse_motion {
2835	my ($self, $ev, $x, $y) = @_;	3508	my ($self, $ev, $x, $y) = @_;
2836		3509
2837	# TODO: should use vbox->find_widget or so	3510	# TODO: should use vbox->find_widget or so
2838	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3511	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2839	$self->{hover} = $self->{item}{$HOVER};	3512	$self->{hover} = $self->{item}{$HOVER};
2840	}
2841		3513
		3514	0
		3515	}
		3516
2842	sub button_up {	3517	sub invoke_button_up {
2843	my ($self, $ev, $x, $y) = @_;	3518	my ($self, $ev, $x, $y) = @_;
2844		3519
2845	if ($ev->{button} == $self->{button}) {	3520	if ($ev->{button} == $self->{button}) {
2846	undef $GRAB;	3521	undef $GRAB;
2847	$self->hide;	3522	$self->hide;
2848		3523
2849	$self->_emit ("popdown");	3524	$self->emit ("popdown");
2850	$self->{hover}[1]->() if $self->{hover};	3525	$self->{hover}[1]->() if $self->{hover};
		3526	} else {
		3527	return 0
		3528	}
		3529
2851	}	3530	1
2852	}	3531	}
2853		3532
2854	#############################################################################	3533	#############################################################################
2855		3534
2856	package CFClient::UI::Statusbox;	3535	package CFPlus::UI::Multiplexer;
2857		3536
2858	our @ISA = CFClient::UI::VBox::;	3537	our @ISA = CFPlus::UI::Container::;
2859		3538
2860	sub new {	3539	sub new {
2861	my $class = shift;	3540	my $class = shift;
2862		3541
2863	$class->SUPER::new (	3542	my $self = $class->SUPER::new (
		3543	@_,
		3544	);
		3545
		3546	$self->{current} = $self->{children}[0]
		3547	if @{ $self->{children} };
		3548
		3549	$self
		3550	}
		3551
		3552	sub add {
		3553	my ($self, @widgets) = @_;
		3554
		3555	$self->SUPER::add (@widgets);
		3556
		3557	$self->{current} = $self->{children}[0]
		3558	if @{ $self->{children} };
		3559	}
		3560
		3561	sub get_current_page {
		3562	my ($self) = @_;
		3563
		3564	$self->{current}
		3565	}
		3566
		3567	sub set_current_page {
		3568	my ($self, $page_or_widget) = @_;
		3569
		3570	my $widget = ref $page_or_widget
		3571	? $page_or_widget
		3572	: $self->{children}[$page_or_widget];
		3573
		3574	$self->{current} = $widget;
		3575	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3576
		3577	$self->emit (page_changed => $self->{current});
		3578
		3579	$self->realloc;
		3580	}
		3581
		3582	sub visible_children {
		3583	$_[0]{current}
		3584	}
		3585
		3586	sub size_request {
		3587	my ($self) = @_;
		3588
		3589	$self->{current}->size_request
		3590	}
		3591
		3592	sub invoke_size_allocate {
		3593	my ($self, $w, $h) = @_;
		3594
		3595	$self->{current}->configure (0, 0, $w, $h);
		3596
		3597	1
		3598	}
		3599
		3600	sub _draw {
		3601	my ($self) = @_;
		3602
		3603	$self->{current}->draw;
		3604	}
		3605
		3606	#############################################################################
		3607
		3608	package CFPlus::UI::Notebook;
		3609
		3610	our @ISA = CFPlus::UI::VBox::;
		3611
		3612	sub new {
		3613	my $class = shift;
		3614
		3615	my $self = $class->SUPER::new (
		3616	buttonbar => (new CFPlus::UI::Buttonbar),
		3617	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3618	# filter => # will be put between multiplexer and $self
		3619	@_,
		3620	);
		3621
		3622	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3623	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3624
		3625	$self
		3626	}
		3627
		3628	sub add {
		3629	my ($self, $title, $widget, $tooltip) = @_;
		3630
		3631	CFPlus::weaken $self;
		3632
		3633	$self->{buttonbar}->add (new CFPlus::UI::Button
		3634	markup => $title,
		3635	tooltip => $tooltip,
		3636	on_activate => sub { $self->set_current_page ($widget) },
		3637	);
		3638
		3639	$self->{multiplexer}->add ($widget);
		3640	}
		3641
		3642	sub get_current_page {
		3643	my ($self) = @_;
		3644
		3645	$self->{multiplexer}->get_current_page
		3646	}
		3647
		3648	sub set_current_page {
		3649	my ($self, $page) = @_;
		3650
		3651	$self->{multiplexer}->set_current_page ($page);
		3652	$self->emit (page_changed => $self->{multiplexer}{current});
		3653	}
		3654
		3655	#############################################################################
		3656
		3657	package CFPlus::UI::Selector;
		3658
		3659	use utf8;
		3660
		3661	our @ISA = CFPlus::UI::Button::;
		3662
		3663	sub new {
		3664	my $class = shift;
		3665
		3666	my $self = $class->SUPER::new (
		3667	options => [], # [value, title, longdesc], ...
		3668	value => undef,
		3669	@_,
		3670	);
		3671
		3672	$self->_set_value ($self->{value});
		3673
		3674	$self
		3675	}
		3676
		3677	sub invoke_button_down {
		3678	my ($self, $ev) = @_;
		3679
		3680	my @menu_items;
		3681
		3682	for (@{ $self->{options} }) {
		3683	my ($value, $title, $tooltip) = @$_;
		3684
		3685	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3686	}
		3687
		3688	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3689	}
		3690
		3691	sub _set_value {
		3692	my ($self, $value) = @_;
		3693
		3694	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3695	or return;
		3696
		3697	$self->{value} = $item->[0];
		3698	$self->set_markup ("$item->[1] ⇓");
		3699	$self->set_tooltip ($item->[2]);
		3700	}
		3701
		3702	sub set_value {
		3703	my ($self, $value) = @_;
		3704
		3705	return unless $self->{value} ne $value;
		3706
		3707	$self->_set_value ($value);
		3708	$self->emit (changed => $value);
		3709	}
		3710
		3711	#############################################################################
		3712
		3713	package CFPlus::UI::Statusbox;
		3714
		3715	our @ISA = CFPlus::UI::VBox::;
		3716
		3717	sub new {
		3718	my $class = shift;
		3719
		3720	my $self = $class->SUPER::new (
2864	fontsize => 0.8,	3721	fontsize => 0.8,
2865	@_,	3722	@_,
2866	)	3723	);
		3724
		3725	CFPlus::weaken (my $this = $self);
		3726
		3727	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3728
		3729	$self
2867	}	3730	}
2868		3731
2869	sub reorder {	3732	sub reorder {
2870	my ($self) = @_;	3733	my ($self) = @_;
2871	my $NOW = time;	3734	my $NOW = Time::HiRes::time;
		3735
		3736	# freeze display when hovering over any label
		3737	return if $CFPlus::UI::TOOLTIP->{owner}
		3738	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3739	values %{ $self->{item} };
2872		3740
2873	while (my ($k, $v) = each %{ $self->{item} }) {	3741	while (my ($k, $v) = each %{ $self->{item} }) {
2874	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3742	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2875	}	3743	}
2876		3744
…		…
2879	my @items = sort {	3747	my @items = sort {
2880	$a->{pri} <=> $b->{pri}	3748	$a->{pri} <=> $b->{pri}
2881	or $b->{id} <=> $a->{id}	3749	or $b->{id} <=> $a->{id}
2882	} values %{ $self->{item} };	3750	} values %{ $self->{item} };
2883		3751
		3752	$self->{timer}->interval (1);
		3753
2884	my $count = 10 + 1;	3754	my $count = 10 + 1;
2885	for my $item (@items) {	3755	for my $item (@items) {
2886	last unless --$count;	3756	last unless --$count;
2887		3757
2888	push @widgets, $item->{label} ||= do {	3758	my $label = $item->{label} ||= do {
2889	# TODO: doesn't handle markup well (read as: at all)	3759	# TODO: doesn't handle markup well (read as: at all)
2890	my $short = $item->{count} > 1	3760	my $short = $item->{count} > 1
2891	? "<b>$item->{count} ×</b> $item->{text}"	3761	? "<b>$item->{count} ×</b> $item->{text}"
2892	: $item->{text};	3762	: $item->{text};
2893		3763
2894	for ($short) {	3764	for ($short) {
2895	s/^\s+//;	3765	s/^\s+//;
2896	s/\s+/ /g;	3766	s/\s+/ /g;
2897	}	3767	}
2898		3768
2899	new CFClient::UI::Label	3769	new CFPlus::UI::Label
2900	markup => $short,	3770	markup => $short,
2901	tooltip => $item->{tooltip},	3771	tooltip => $item->{tooltip},
2902	tooltip_font => $::FONT_PROP,	3772	tooltip_font => $::FONT_PROP,
2903	tooltip_width => 0.67,	3773	tooltip_width => 0.67,
2904	fontsize => $item->{fontsize} || $self->{fontsize},	3774	fontsize => $item->{fontsize} || $self->{fontsize},
2905	max_w => $::WIDTH * 0.44,	3775	max_w => $::WIDTH * 0.44,
2906	fg => $item->{fg},	3776	fg => [@{ $item->{fg} }],
2907	can_events => 1,	3777	can_events => 1,
2908	can_hover => 1	3778	can_hover => 1
2909	};	3779	};
		3780
		3781	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3782	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3783	$label->update;
		3784	$label->set_max_size (undef, $label->{req_h} * $diff)
		3785	if $diff < 1;
		3786	$self->{timer}->interval (1/30);
		3787	} else {
		3788	$label->{fg}[3] = $item->{fg}[3] || 1;
		3789	}
		3790
		3791	push @widgets, $label;
2910	}	3792	}
2911		3793
2912	$self->clear;	3794	$self->clear;
2913	$self->SUPER::add (reverse @widgets);	3795	$self->SUPER::add (reverse @widgets);
2914	}	3796	}
…		…
2919	$text =~ s/^\s+//;	3801	$text =~ s/^\s+//;
2920	$text =~ s/\s+$//;	3802	$text =~ s/\s+$//;
2921		3803
2922	return unless $text;	3804	return unless $text;
2923		3805
2924	my $timeout = time + ((delete $arg{timeout}) || 60);	3806	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2925		3807
2926	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3808	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2927		3809
2928	if (my $item = $self->{item}{$group}) {	3810	if (my $item = $self->{item}{$group}) {
2929	if ($item->{text} eq $text) {	3811	if ($item->{text} eq $text) {
2930	$item->{count}++;	3812	$item->{count}++;
2931	} else {	3813	} else {
2932	$item->{count} = 1;	3814	$item->{count} = 1;
2933	$item->{text} = $item->{tooltip} = $text;	3815	$item->{text} = $item->{tooltip} = $text;
2934	}	3816	}
2935	$item->{id} = ++$self->{id};	3817	$item->{id} += 0.2;#d#
2936	$item->{timeout} = $timeout;	3818	$item->{timeout} = $timeout;
2937	delete $item->{label};	3819	delete $item->{label};
2938	} else {	3820	} else {
2939	$self->{item}{$group} = {	3821	$self->{item}{$group} = {
2940	id => ++$self->{id},	3822	id => ++$self->{id},
…		…
2946	count => 1,	3828	count => 1,
2947	%arg,	3829	%arg,
2948	};	3830	};
2949	}	3831	}
2950		3832
		3833	$ROOT->on_refresh (reorder => sub {
2951	$self->reorder;	3834	$self->reorder;
		3835	});
2952	}	3836	}
2953		3837
2954	sub reconfigure {	3838	sub reconfigure {
2955	my ($self) = @_;	3839	my ($self) = @_;
2956		3840
…		…
2959		3843
2960	$self->reorder;	3844	$self->reorder;
2961	$self->SUPER::reconfigure;	3845	$self->SUPER::reconfigure;
2962	}	3846	}
2963		3847
		3848	sub destroy {
		3849	my ($self) = @_;
		3850
		3851	$self->{timer}->cancel;
		3852
		3853	$self->SUPER::destroy;
		3854	}
		3855
2964	#############################################################################	3856	#############################################################################
2965		3857
2966	package CFClient::UI::Root;	3858	package CFPlus::UI::Root;
2967		3859
2968	our @ISA = CFClient::UI::Container::;	3860	our @ISA = CFPlus::UI::Container::;
2969		3861
		3862	use List::Util qw(min max);
		3863
2970	use CFClient::OpenGL;	3864	use CFPlus::OpenGL;
2971		3865
2972	sub new {	3866	sub new {
2973	my $class = shift;	3867	my $class = shift;
2974		3868
2975	$class->SUPER::new (	3869	my $self = $class->SUPER::new (
2976	visible => 1,	3870	visible => 1,
2977	@_,	3871	@_,
2978	)	3872	);
2979	}
2980		3873
2981	sub configure {	3874	CFPlus::weaken ($self->{root} = $self);
2982	my ($self, $x, $y, $w, $h) = @_;
2983		3875
2984	$self->{w} = $w;	3876	$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	}	3877	}
2994		3878
2995	sub size_request {	3879	sub size_request {
2996	my ($self) = @_;	3880	my ($self) = @_;
2997		3881
2998	($self->{w}, $self->{h})	3882	($self->{w}, $self->{h})
2999	}	3883	}
3000		3884
		3885	sub _to_pixel {
		3886	my ($coord, $size, $max) = @_;
		3887
		3888	$coord =
		3889	$coord eq "center" ? ($max - $size) * 0.5
		3890	: $coord eq "max" ? $max
		3891	: $coord;
		3892
		3893	$coord = 0 if $coord < 0;
		3894	$coord = $max - $size if $coord > $max - $size;
		3895
		3896	int $coord + 0.5
		3897	}
		3898
3001	sub size_allocate {	3899	sub invoke_size_allocate {
3002	my ($self, $w, $h) = @_;	3900	my ($self, $w, $h) = @_;
3003		3901
3004	for my $child ($self->children) {	3902	for my $child ($self->children) {
3005	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3903	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3006		3904
3007	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3905	$X = $child->{force_x} if exists $child->{force_x};
3008	if exists $child->{req_x};	3906	$Y = $child->{force_y} if exists $child->{force_y};
3009		3907
3010	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3908	$X = _to_pixel $X, $W, $self->{w};
3011	if exists $child->{req_y};	3909	$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		3910
3018	$child->configure ($X, $Y, $W, $H);	3911	$child->configure ($X, $Y, $W, $H);
3019	}	3912	}
		3913
		3914	1
3020	}	3915	}
3021		3916
3022	sub coord2local {	3917	sub coord2local {
3023	my ($self, $x, $y) = @_;	3918	my ($self, $x, $y) = @_;
3024		3919
…		…
3032	}	3927	}
3033		3928
3034	sub update {	3929	sub update {
3035	my ($self) = @_;	3930	my ($self) = @_;
3036		3931
3037	$self->check_size;
3038	$::WANT_REFRESH++;	3932	$::WANT_REFRESH++;
3039	}	3933	}
3040		3934
3041	sub add {	3935	sub add {
3042	my ($self, @children) = @_;	3936	my ($self, @children) = @_;
3043		3937
3044	for my $child (@children) {
3045	$child->{is_toplevel} = 1;	3938	$_->{is_toplevel} = 1
3046		3939	for @children;
3047	# integerise window positions
3048	$child->{x} = int $child->{x};
3049	$child->{y} = int $child->{y};
3050	}
3051		3940
3052	$self->SUPER::add (@children);	3941	$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	}	3942	}
3060		3943
3061	sub remove {	3944	sub remove {
3062	my ($self, @children) = @_;	3945	my ($self, @children) = @_;
3063		3946
3064	$self->SUPER::remove (@children);	3947	$self->SUPER::remove (@children);
		3948
		3949	delete $self->{is_toplevel}
		3950	for @children;
3065		3951
3066	while (@children) {	3952	while (@children) {
3067	my $w = pop @children;	3953	my $w = pop @children;
3068	push @children, $w->children;	3954	push @children, $w->children;
3069	$w->set_invisible;	3955	$w->set_invisible;
…		…
3088	while ($self->{refresh_hook}) {	3974	while ($self->{refresh_hook}) {
3089	$_->()	3975	$_->()
3090	for values %{delete $self->{refresh_hook}};	3976	for values %{delete $self->{refresh_hook}};
3091	}	3977	}
3092		3978
3093	if ($self->{check_size}) {	3979	if ($self->{realloc}) {
		3980	my %queue;
3094	my @queue;	3981	my @queue;
		3982	my $widget;
3095		3983
3096	for (;;) {	3984	outer:
3097	if ($self->{check_size}) {	3985	while () {
3098	#TODO use array-of-depth approach	3986	if (my $realloc = delete $self->{realloc}) {
		3987	for $widget (values %$realloc) {
		3988	$widget->{visible} or next; # do not resize invisible widgets
3099		3989
3100	@queue = sort { $a->{visible} <=> $b->{visible} }	3990	$queue{$widget+0}++ and next; # duplicates are common
3101	@queue, values %{delete $self->{check_size}};	3991
		3992	push @{ $queue[$widget->{visible}] }, $widget;
		3993	}
3102	}	3994	}
3103		3995
		3996	while () {
		3997	@queue or last outer;
		3998
3104	my $widget = pop @queue || last;	3999	$widget = pop @{ $queue[-1] || [] }
3105		4000	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		4001
		4002	pop @queue;
		4003	}
		4004
		4005	delete $queue{$widget+0};
		4006
		4007	my ($w, $h) = $widget->size_request;
		4008
		4009	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		4010	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4011
		4012	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4013	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4014
		4015	$w = $widget->{force_w} if exists $widget->{force_w};
		4016	$h = $widget->{force_h} if exists $widget->{force_h};
		4017
		4018	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		4019	|| delete $widget->{force_realloc}) {
3116	$widget->{req_w} = $w;	4020	$widget->{req_w} = $w;
3117	$widget->{req_h} = $h;	4021	$widget->{req_h} = $h;
3118		4022
3119	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	4023	$self->{size_alloc}{$widget+0} = $widget;
3120		4024
3121	$widget->{parent}->check_size
3122	if $widget->{parent};	4025	if (my $parent = $widget->{parent}) {
		4026	$self->{realloc}{$parent+0} = $parent
		4027	unless $queue{$parent+0};
		4028
		4029	$parent->{force_size_alloc} = 1;
		4030	$self->{size_alloc}{$parent+0} = $parent;
		4031	}
3123	}	4032	}
		4033
		4034	delete $self->{realloc}{$widget+0};
3124	}	4035	}
3125	}	4036	}
3126		4037
3127	while ($self->{size_alloc}) {	4038	while (my $size_alloc = delete $self->{size_alloc}) {
3128	for (
3129	sort { $a->[0]{visible} <=> $b->[0]{visible} }	4039	my @queue = sort { $b->{visible} <=> $a->{visible} }
3130	values %{delete $self->{size_alloc}}	4040	values %$size_alloc;
3131	) {	4041
3132	my ($widget, $w, $h) = @$_;	4042	while () {
		4043	my $widget = pop @queue || last;
		4044
		4045	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133		4046
3134	$w = 0 if $w < 0;	4047	$w = 0 if $w < 0;
3135	$h = 0 if $h < 0;	4048	$h = 0 if $h < 0;
3136		4049
		4050	$w = max $widget->{min_w}, $w;
		4051	$h = max $widget->{min_h}, $h;
		4052
		4053	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4054	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4055
		4056	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4057	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4058
		4059	$w = int $w + 0.5;
		4060	$h = int $h + 0.5;
		4061
		4062	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4063	$widget->{old_w} = $widget->{w};
		4064	$widget->{old_h} = $widget->{h};
		4065
3137	$widget->{w} = $w;	4066	$widget->{w} = $w;
3138	$widget->{h} = $h;	4067	$widget->{h} = $h;
		4068
3139	$widget->emit (size_allocate => $w, $h);	4069	$widget->emit (size_allocate => $w, $h);
		4070	}
3140	}	4071	}
3141	}	4072	}
3142		4073
3143	while ($self->{post_alloc_hook}) {	4074	while ($self->{post_alloc_hook}) {
3144	$_->()	4075	$_->()
3145	for values %{delete $self->{post_alloc_hook}};	4076	for values %{delete $self->{post_alloc_hook}};
3146	}	4077	}
		4078
3147		4079
3148	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4080	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3149	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4081	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3150	glClear GL_COLOR_BUFFER_BIT;	4082	glClear GL_COLOR_BUFFER_BIT;
3151		4083
…		…
3153	glLoadIdentity;	4085	glLoadIdentity;
3154	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4086	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3155	glMatrixMode GL_MODELVIEW;	4087	glMatrixMode GL_MODELVIEW;
3156	glLoadIdentity;	4088	glLoadIdentity;
3157		4089
		4090	{
		4091	package CFPlus::UI::Base;
		4092
		4093	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4094	(0, 0, $self->{w}, $self->{h});
		4095
3158	$self->_draw;	4096	$self->_draw;
		4097	}
3159	}	4098	}
3160		4099
3161	#############################################################################	4100	#############################################################################
3162		4101
3163	package CFClient::UI;	4102	package CFPlus::UI;
3164		4103
3165	$ROOT = new CFClient::UI::Root;	4104	$ROOT = new CFPlus::UI::Root;
3166	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4105	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3167		4106
3168	1	4107	1
3169		4108

Diff Legend

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