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

Diff Legend

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